diff -Nru ogmrip-0.11.1/aclocal.m4 ogmrip-0.12.2/aclocal.m4 --- ogmrip-0.11.1/aclocal.m4 2007-10-21 21:05:51.000000000 +0200 +++ ogmrip-0.12.2/aclocal.m4 2008-09-21 14:16:31.000000000 +0200 @@ -154,8 +154,7 @@ #----------------- glib_DEFUN([GLIB_WITH_NLS], dnl NLS is obligatory - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - USE_NLS=yes + [USE_NLS=yes AC_SUBST(USE_NLS) gt_cv_have_gettext=no @@ -485,9 +484,261 @@ fi]) +dnl -*- mode: autoconf -*- + +# serial 1 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST([HTML_DIR]) + + dnl enable/disable documentation building + AC_ARG_ENABLE([gtk-doc], + AS_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) + + if test x$enable_gtk_doc = xyes; then + ifelse([$1],[], + [PKG_CHECK_EXISTS([gtk-doc],, + AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], + [PKG_CHECK_EXISTS([gtk-doc >= $1],, + AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) + fi + + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + + AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) + + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) +]) + + +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 36 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], +[AC_PREREQ([2.50])dnl + +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; +esac + +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $1]) + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` + [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` + ] + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +fi + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + +AC_SUBST(INTLTOOL_DESKTOP_RULE) +AC_SUBST(INTLTOOL_DIRECTORY_RULE) +AC_SUBST(INTLTOOL_KEYS_RULE) +AC_SUBST(INTLTOOL_PROP_RULE) +AC_SUBST(INTLTOOL_OAF_RULE) +AC_SUBST(INTLTOOL_PONG_RULE) +AC_SUBST(INTLTOOL_SERVER_RULE) +AC_SUBST(INTLTOOL_SHEET_RULE) +AC_SUBST(INTLTOOL_SOUNDLIST_RULE) +AC_SUBST(INTLTOOL_UI_RULE) +AC_SUBST(INTLTOOL_XAM_RULE) +AC_SUBST(INTLTOOL_KBD_RULE) +AC_SUBST(INTLTOOL_XML_RULE) +AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) +AC_SUBST(INTLTOOL_CAVES_RULE) +AC_SUBST(INTLTOOL_SCHEMAS_RULE) +AC_SUBST(INTLTOOL_THEME_RULE) +AC_SUBST(INTLTOOL_SERVICE_RULE) +AC_SUBST(INTLTOOL_POLICY_RULE) + +# Check the gettext tools to make sure they are GNU +AC_PATH_PROG(XGETTEXT, xgettext) +AC_PATH_PROG(MSGMERGE, msgmerge) +AC_PATH_PROG(MSGFMT, msgfmt) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi + +# Use the tools built into the package, not the ones that are installed. +AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') +AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') +AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') + +AC_PATH_PROG(INTLTOOL_PERL, perl) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found; required for intltool]) +fi +if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then + AC_MSG_ERROR([perl 5.x required for intltool]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi +fi + +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) + +# Set DATADIRNAME correctly if it is not set yet +# (copied from glib-gettext.m4) +if test -z "$DATADIRNAME"; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], + [[extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr]])], + [DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share + dnl in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [DATADIRNAME=share], [DATADIRNAME=lib]) + ;; + *) + [DATADIRNAME=lib] + ;; + esac]) +fi +AC_SUBST(DATADIRNAME) + +IT_PO_SUBDIR([po]) + +dnl The following is very similar to +dnl +dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) +dnl +dnl with the following slight differences: +dnl - the *.in files are in ac_aux_dir, +dnl - if the file haven't changed upon reconfigure, it's not touched, +dnl - the evaluation of the third parameter enables a hack which computes +dnl the actual value of $libdir, +dnl - the user sees "executing intltool commands", instead of +dnl "creating intltool-extract" and such. +dnl +dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were +dnl a reason for it. + +AC_CONFIG_COMMANDS([intltool], [ + +for file in intltool-extract intltool-merge intltool-update; do + sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ + -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ + -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ + < ${ac_aux_dir}/${file}.in > ${file}.out + if cmp -s ${file} ${file}.out 2>/dev/null; then + rm -f ${file}.out + else + mv -f ${file}.out ${file} + fi + chmod ugo+x ${file} + chmod u+w ${file} +done + +], +[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' +prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" +INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) + +]) + + +# IT_PO_SUBDIR(DIRNAME) +# --------------------- +# All po subdirs have to be declared with this macro; the subdir "po" is +# declared by IT_PROG_INTLTOOL. +# +AC_DEFUN([IT_PO_SUBDIR], +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. +dnl +dnl The following CONFIG_COMMANDS should be exetuted at the very end +dnl of config.status. +AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d + s/^[[].*] *// + /^[ ]*$/d + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] + if test ! -f "$1/Makefile"; then + AC_MSG_ERROR([$1/Makefile is not ready.]) + fi + mv "$1/Makefile" "$1/Makefile.tmp" + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } + ' "$1/Makefile.tmp" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" + ]) +])dnl +]) + + +# deprecated macros +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +# A hint is needed for aclocal from Automake <= 1.9.4: +# AC_DEFUN([AC_PROG_INTLTOOL], ...) + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 51 AC_PROG_LIBTOOL +# serial 52 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -575,7 +826,6 @@ AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_EXEEXT])dnl dnl - AC_LIBTOOL_SYS_MAX_CMD_LEN AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE AC_LIBTOOL_OBJDIR @@ -677,6 +927,8 @@ ;; esac +_LT_REQUIRED_DARWIN_CHECKS + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], enable_win32_dll=yes, enable_win32_dll=no) @@ -720,7 +972,7 @@ *** \$ltmain is not defined, please check the patch for consistency! *** ]) fi -gentoo_lt_version="1.5.24" +gentoo_lt_version="1.5.26" gentoo_ltmain_version=`sed -n '/^[[ ]]*VERSION=/{s/^[[ ]]*VERSION=//;p;q;}' "$ltmain"` if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then AC_MSG_RESULT(no) @@ -799,9 +1051,80 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* ])# _LT_LINKER_BOILERPLATE +# _LT_REQUIRED_DARWIN_CHECKS +# -------------------------- +# Check for some things on darwin +AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + case $host_os in + rhapsody* | darwin1.[[0123]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac +]) # _LT_AC_SYS_LIBPATH_AIX # ---------------------- @@ -1126,7 +1449,11 @@ *64-bit*) case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; esac ;; esac @@ -1219,7 +1546,7 @@ $2=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" ]) @@ -1490,7 +1817,7 @@ AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], [AC_CHECK_FUNC([dlopen], [lt_cv_dlopen="dlopen"], [AC_CHECK_LIB([dl], [dlopen], @@ -1498,7 +1825,7 @@ [AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ]) ]) ]) @@ -1815,7 +2142,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[[4-9]]*) version_type=linux need_lib_prefix=no need_version=no @@ -2349,6 +2676,13 @@ AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no +AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], +[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], +[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -2848,7 +3182,7 @@ # whether `pass_all' will *always* work, you probably want this one. case $host_os in -aix4* | aix5*) +aix[[4-9]]*) lt_cv_deplibs_check_method=pass_all ;; @@ -3284,7 +3618,7 @@ fi ;; -aix4* | aix5*) +aix[[4-9]]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -3341,6 +3675,7 @@ _LT_AC_TAGVAR(predeps, $1)= _LT_AC_TAGVAR(postdeps, $1)= _LT_AC_TAGVAR(compiler_lib_search_path, $1)= +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= # Source file extension for C++ test sources. ac_ext=cpp @@ -3450,7 +3785,7 @@ # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -3463,7 +3798,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) @@ -3609,51 +3944,23 @@ fi ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + if test "$GXX" = yes ; then output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else case $cc_basename in xlc*) @@ -3904,7 +4211,7 @@ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' @@ -4339,7 +4646,8 @@ # compiler output when linking a shared library. # Parse the compiler output and extract the necessary # objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], +[AC_REQUIRE([LT_AC_PROG_SED])dnl dnl we can't use the lt_simple_compile_test_code here, dnl because it contains code intended for an executable, dnl not a library. It's possible we should let each @@ -4464,6 +4772,11 @@ $rm -f confest.$objext +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi + # PORTME: override above test on systems where it is broken ifelse([$1],[CXX], [case $host_os in @@ -4520,7 +4833,6 @@ ;; esac ]) - case " $_LT_AC_TAGVAR(postdeps, $1) " in *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; esac @@ -4605,7 +4917,7 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4* | aix5*) +aix[[4-9]]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -4782,6 +5094,7 @@ _LT_AC_TAGVAR(predeps, $1) \ _LT_AC_TAGVAR(postdeps, $1) \ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ _LT_AC_TAGVAR(archive_cmds, $1) \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ _LT_AC_TAGVAR(postinstall_cmds, $1) \ @@ -4844,7 +5157,7 @@ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -5081,6 +5394,10 @@ # shared library. postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) @@ -5430,7 +5747,7 @@ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD cat conftest.$ac_ext >&5 fi - rm -f conftest* conftst* + rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then @@ -5487,7 +5804,8 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -5524,7 +5842,7 @@ esac else case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # All AIX code is PIC. if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor @@ -5620,7 +5938,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler. _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' @@ -5771,7 +6089,8 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) @@ -5841,7 +6160,8 @@ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; hpux9* | hpux10* | hpux11*) @@ -5978,7 +6298,7 @@ # if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in "" | " "*) ;; @@ -6002,7 +6322,7 @@ # wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), $lt_tmp_static_flag, [], [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) @@ -6018,7 +6338,7 @@ ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then @@ -6037,6 +6357,7 @@ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ],[ runpath_var= _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -6067,12 +6388,14 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. _LT_CC_BASENAME([$compiler]) @@ -6122,7 +6445,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -6341,7 +6664,7 @@ fi ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -6361,7 +6684,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -6521,11 +6844,10 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -7174,16 +7496,14 @@ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -7227,9 +7547,9 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -7254,7 +7574,7 @@ _PKG_TEXT -To get pkg-config, see .])], +To get pkg-config, see .])], [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -8130,5 +8450,3 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([m4/gtk-doc.m4]) -m4_include([m4/intltool.m4]) diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/ChangeLog /tmp/v6alHitLZN/ogmrip-0.12.2/ChangeLog --- ogmrip-0.11.1/ChangeLog 2007-10-21 21:05:18.000000000 +0200 +++ ogmrip-0.12.2/ChangeLog 2008-09-15 22:46:38.000000000 +0200 @@ -1,15 +1,1130 @@ -21 Oct 2007 Olivier Rolland +15 Sep 2008 Olivier Rolland + + * libogmrip/ogmrip-mplayer.c + + Improved audio streams support + +14 Sep 2008 Olivier Rolland + + * libogmrip/ogmrip-version.c + + Fixed version checking + + * libogmrip/ogmrip-vorbis.c + * libogmrip/ogmrip-aac.c + * libogmrip/ogmrip-mp3.c + + Used wave instead of pcm for audio extraction + +27 Jul 2008 Olivier Rolland + + * src/ogmrip-main.c + * src/ogmrip-audio-options.c + * src/ogmrip-subp-options.c + + Fixed default options + + * src/ogmrip-profiles.c + + Fixed profiles with empty names (patch from Alex L. Mauer) + + * src/ogmrip-options.c + * data/ogmrip-options.glade + + Fixed deinterlacer + +24 Jul 2008 Olivier Rolland + + * configure.in + * dvdcpy/dvdcpy.c + * libogmjob/ogmjob-exec.c + * libogmrip-gtk/ogmrip-helper.c + * src/ogmrip-profiles.c + * subrip/subp2pgm.c + + Fixed compilation issues + + * src/ogmrip-main.c + + Fixed profiles list when no prefered audio and subp language is + selected + +16 Jul 2008 Olivier Rolland + + * configure.in + * Makefile.am + * docs/reference/ogmdvd-gtk/Makefile.am + * docs/reference/ogmjob/Makefile.am + * docs/reference/ogmrip-gtk/Makefile.am + * docs/reference/ogmrip/Makefile.am + * libbacon/Makefile.am + * libogmdvd-gtk/Makefile.am + * libogmdvd-gtk/ogmdvd-gtk-fake.cpp + * src/Makefile.am + * src/ogmrip-fake.cpp + + Fixed more linking issues with --as-needed (initial patch from + aballier_at_gentoo_org) + +15 Jul 2008 Olivier Rolland + + * libogmdvd/Makefile.am + * libogmjob/Makefile.am + * libogmrip-gtk/Makefile.am + * libogmrip/Makefile.am + + Fixed linking with --as-needed + +14 Jul 2008 Olivier Rolland + + Released OGMRip-0.12.1 + +14 Jul 2008 Olivier Rolland + + * libogmrip/ogmrip-lavc.c + * libogmrip/ogmrip-video-codec.c + + Fixed compilation issues with gcc-4.3 + +07 Jun 2008 Olivier Rolland + + * src/ogmrip-main.c + + Fixed default profile + + * libogmrip/ogmrip-mplayer.c + + Fixed AAC and AC3/DTS support in AVI + +28 Jun 2008 Olivier Rolland + + * src/ogmrip-main.c + * src/ogmrip-options.c + * src/ogmrip-options.h + * libogmrip-gtk/ogmrip-chooser-list.c + * libogmrip-gtk/ogmrip-chooser-list.h + * docs/reference/ogmrip-gtk/ogmrip-gtk-sections.txt + * docs/reference/ogmrip-gtk/tmpl/ogmrip-chooser-list.sgml + + Only profiles supporting as many audio tracks and subtitles as + selected are displayed in the options dialog + +15 Jun 2008 Olivier Rolland + + * libogmrip/ogmrip-avi.c + + Fixed extension when copying subtitles + + * src/ogmrip-profiles.c + * data/ogmrip-profiles.glade + * po/fr.po + + Added copy of profiles + +14 Jun 2008 Olivier Rolland + + * src/ogmrip-profile-editor.c + + Fixed default container and codec + +08 Jun 2008 Olivier Rolland + + * libogmrip-gtk/Makefile.am + * libogmrip/ogmrip-plugin.c + * src/ogmrip-profiles.c + + Fixed some unwanted error messages + +08 Jun 2008 Olivier Rolland + + Released OGMRip-0.12.0 + +08 Jun 2008 Olivier Rolland + + * libogmrip/ogmrip-srt.c + + Improved tesseract support + + * data/ogmrip.schemas.in + + Copy DVD by default + + * libogmrip/ogmrip-subp-codec.h + * libogmrip/ogmrip-audio-codec.h + + Cleanup + +07 Jun 2008 Olivier Rolland + + * dvdcpy/dvdcpy.c + * libogmrip/ogmrip-vobsub.c + * subrip/subp2pgm.c + + Cleanup + +05 Jun 2008 Olivier Rolland + + * libogmrip/ogmrip-mplayer.c + * libogmrip/ogmrip-video-codec.c + * libogmrip/ogmrip-video-codec.h + * src/ogmrip-main.c + * src/ogmrip-gconf.h + + Merged expand and max sizes + + * libogmrip/ogmrip-x264.c + * libogmrip-gtk/ogmrip-x264-options.c + * data/ogmrip-x264.glade + + Added global_header option + +04 Jun 2008 Olivier Rolland + + * libogmrip/ogmrip-video-codec.c + * libogmrip/ogmrip-video-codec.h + * src/ogmrip-main.c + * src/ogmrip-gconf.h + + Added maximum size + + * libogmrip/ogmrip-vobsub.c + * data/ogmrip-profile-editor.glade + + Added forced subs support for vobsub + +02 Jun 2008 Olivier Rolland + + * Makefile.am + * data/Makefile.am + * docs/reference/ogmjob/Makefile.am + * docs/tutorial/data/Makefile.am + * docs/tutorial/en/Makefile.am + * docs/tutorial/fr/Makefile.am + + Fixed distcheck + +29 May 2008 Olivier Rolland + + * libogmrip/ogmrip-srt.c + * libogmrip/ogmrip-subp-codec.c + * src/ogmrip-audio-options.c + * src/ogmrip-subp-options.c + + Fixed forced subtitles support + + * src/ogmrip-main.c + + Removed unneeded checks + +27 May 2008 Olivier Rolland + + * subrip/subp2pgm.c + * subrip/vobsub.c + * subrip/spudec.c + * subrip/vobsub.h + * subrip/Makefile.am + * subrip/spudec.h + + Fixed subp2pgm + +26 May 2008 Olivier Rolland + + * data/ogmrip-main.glade + * libogmrip/ogmrip-video-codec.c + * src/ogmrip-main.c + + Added multi-angle support + +16 May 2008 Olivier Rolland + + * libogmrip/ogmrip-vorbis.c + * libogmrip/ogmrip-srt.c + * libogmrip/ogmrip-wav.c + * libogmrip/ogmrip-aac.c + * libogmrip/ogmrip-mp3.c + * libogmrip/ogmrip-vobsub.c + * libogmrip/ogmrip-mplayer.c + * libogmrip/ogmrip-mplayer.h + + Cleanup API + + * subrip/subptools.c + + Fixed SRT support + + * libogmrip/ogmrip-srt.c + + Use tesseract by default + +12 May 2008 Olivier Rolland + + * libogmrip/ogmrip-vobsub.c + * theoraenc/theoraenc.c + + Fixed compilation on SE-Linux (patch from Jiří Moravec) + + * configure.in + + Fixed gtk-doc support + +11 May 2008 Olivier Rolland + + * subrip/subp2pgm.c + + Improved palette normalization + +06 May 2008 Olivier Rolland + + * libogmrip/ogmrip-mp4.c + + Added -brand mp42 + +05 May 2008 Olivier Rolland + + * libogmrip/ogmrip-mplayer.c + * libogmrip/ogmrip-xvid.c + * libogmrip/ogmrip-mplayer.h + * libogmrip/ogmrip-lavc.c + * libogmrip/ogmrip-x264.c + * libogmrip/ogmrip-acopy.c + * libogmrip/ogmrip-theora.c + + Cleaned up the API + + * src/ogmrip-profiles.c + * src/ogmrip-main.c + * src/ogmrip-options.c + * src/ogmrip-options.h + * src/ogmrip-gconf.h + + Improved ergonomy + + * libogmrip/ogmrip-srt.c + + Fixed temporary directory + + * subrip/subp2pgm.c + * libogmrip/ogmrip-srt.c + + Improved OCR support + + * data/ogmrip-gtk.pc.in + * data/ogmrip.pc.in + + Added variables for plugins + +04 May 2008 Olivier Rolland + + * libogmrip/ogmrip-lavc.c + * libogmrip/ogmrip-x264.c + + Fixed lavc and x264 presets + + * libogmrip/ogmrip-mp4.c + + Fixed number of audio and subtitles streams + Fixed support of video streams with b frames + + * data/ogmrip-profile-editor.glade + * libogmrip/ogmrip-video-codec.c + * src/ogmrip-profile-editor.c + + Forced 1-pass mode when encoding with a fixed quantizer + + * libogmrip/ogmrip-video-codec.c + + Improved compliance with non-standard DVD + + * src/ogmrip-profiles.c + * src/ogmrip-profiles.h + * src/ogmrip-options.c + + Improved ergonomy (slightly) + + * libogmrip/ogmrip-mplayer.c + * libogmrip/ogmrip-video-codec.c + * libogmrip/ogmrip-video-codec.h + * src/ogmrip-main.c + * src/ogmrip-gconf.h + + Fixed max resolution in profiles + +03 May 2008 Olivier Rolland + + * src/ogmrip-profiles.c + * src/ogmrip-profiles.h + * src/ogmrip-main.c + * data/profiles.xml.in + * data/Makefile.am + + Improved profiles support + + * src/ogmrip-pref.c + + Cleanup + + * src/ogmrip-main.c + * src/ogmrip-options.c + * src/ogmrip-options.h + * src/ogmrip-gconf.h + + Added options to disable cropping and scaling and to force a + resolution in profiles + +02 May 2008 Olivier Rolland + + * src/ogmrip-profiles.c + + Added support for localized profiles + +27 Apr 2008 Olivier Rolland + + * configure.in + * subrip/Makefile.am + * subrip/subp2pgm.c + * subrip/subptools.c + + Improved TIFF and PNG support + +24 Apr 2008 Olivier Rolland + + * configure.in + * libogmrip/ogmrip-srt.c + * libogmrip/ogmrip-srt.h + * subrip/subp2pgm.1 + * subrip/subp2pgm.c + * subrip/srtutil.1 + * subrip/srtutil.c + * subrip/Makefile.am + * subrip/subptools.1 + * subrip/subptools.c + + Improved subtitles support + Added tesseract OCR support + + * src/ogmrip-profile-editor.c + + Disabled simple mode + +20 Apr 2008 Olivier Rolland + + * src/ogmrip-progress.c + * libogmjob/ogmjob-exec.c + + Added pulse support + + * libogmrip/Makefile.am + * libogmrip-gtk/Makefile.am + + Fixed compilation issues (once more) + + * README + + Added requirements for notification support + + * data/ogmrip.pc.in + + Added libogmrip-mplayer and libogmrip-lavc + + * libogmjob/ogmjob-exec.c + * libogmjob/ogmjob-pipeline.c + * libogmjob/ogmjob-queue.c + + Fixed pulse support + +14 Apr 2008 Olivier Rolland + + * configure.in + * libogmrip/Makefile.am + * docs/tutorial/en/Makefile.am + * docs/tutorial/fr/Makefile.am + * INSTALL + + Improved autotools scripts + + * libogmrip/ogmrip-video-codec.c + + Renamed the bframes property + +13 Apr 2008 Olivier Rolland + + * src/ogmrip-main.c + * data/ogmrip-ui.xml + + Added profiles edition + + * libogmrip/ogmrip-x264.c + + Set maximum number of thread to 16 + + * src/ogmrip-profile-editor.c + + Fixed video user preset combo item + + * data/ogmrip-profile-editor.glade + * data/ogmrip-simple-editor.glade + + UI improvements + + * libogmrip/ogmrip-mp4.c + * libogmrip/ogmrip-mp4.h + * README + + Switched to gpac for mp4 support + + * Makefile.am + + Fixed subdirs order + +12 Apr 2008 Olivier Rolland + + * libogmrip-gtk/Makefile.am + * data/Makefile.am + + Fixed compilation issues + +23 Mar 2008 Olivier Rolland + + * libogmrip/ogmrip-x264.c + * libogmrip-gtk/ogmrip-x264-options.c + * data/ogmrip-x264.glade + + Fixed 8x8dct properties + + * src/ogmrip-profile-editor.c + * src/ogmrip-main.c + * src/ogmrip-options.c + * src/ogmrip-pref.c + * src/ogmrip-gconf.h + * data/ogmrip-simple-editor.glade + * data/ogmrip-profile-editor.glade + * data/ogmrip-options.glade + * data/ogmrip-pref.glade + + Redesigned the preferences, options and profile editor dialogs + +09 Mar 2008 Olivier Rolland + + * data/ogmrip-lavc.glade + * libogmrip-gtk/ogmrip-lavc-options.c + * libogmrip/ogmrip-lavc.c + * libogmrip/ogmrip-lavc.h + * libogmrip/ogmrip-x264.c + + Improved Lavc support + +08 Mar 2008 Olivier Rolland + + * configure.in + * libogmrip-gtk/Makefile.am + * libogmrip/Makefile.am + * libogmrip/ogmrip-aac.c + * libogmrip/ogmrip-acopy.c + * libogmrip/ogmrip-avi.c + * libogmrip/ogmrip-lavc.c + * libogmrip/ogmrip-lavc-mpeg4.c + * libogmrip/ogmrip-mkv.c + * libogmrip/ogmrip-mov.c + * libogmrip/ogmrip-mp3.c + * libogmrip/ogmrip-mp4.c + * libogmrip/ogmrip-mplayer.c + * libogmrip/ogmrip-ogg.c + * libogmrip/ogmrip-srt.c + * libogmrip/ogmrip-theora.c + * libogmrip/ogmrip-version.c + * libogmrip/ogmrip-version.h.in + * libogmrip/ogmrip-video-codec.c + * libogmrip/ogmrip-vobsub.c + * libogmrip/ogmrip-vorbis.c + * libogmrip/ogmrip-wav.c + * libogmrip/ogmrip-x264.c + * libogmrip/ogmrip-xvid.c + * Makefile.am + * src/ogmrip-crop.c + * src/ogmrip-main.c + + Preliminary support for runtime selection + + * configure.in + + Fixed HAL support + +05 Mar 2008 Olivier Rolland + + * src/ogmrip-profile-editor.c + + Fixed gconf + +05 Mar 2008 Olivier Rolland + + * src/ogmrip-profiles.c + * src/ogmrip-profile-editor.c + * src/ogmrip-pref.c + * data/ogmrip-simple-editor.glade + * data/ogmrip-pref.glade + + Improved expert support + + * libogmrip-gtk/ogmrip-options-plugin.c + + Improved options plugins support + + * data/ogmrip-lavc.glade + * data/ogmrip-x264.glade + + Small UI improvements + +03 Mar 2008 Olivier Rolland + + * dvdcpy/dvdcpy.c + + Small improvement + +02 Mar 2008 Olivier Rolland + + * data/ogmrip-gtk.pc.in + * dvdcpy/dvdcpy.c + * libogmrip-gtk/ogmrip-helper.h + * libogmrip-gtk/ogmrip-preferences.c + * libogmrip-gtk/ogmrip-preferences.h + * libogmrip/ogmrip-video-codec.h + * src/ogmrip-profile-editor.c + + Improvements, fixes and cleanups + + * data/Makefile.am + * data/ogmrip-lavc.glade + * data/profiles.xml.in + * libogmrip-gtk/Makefile.am + * libogmrip-gtk/ogmrip-lavc-options.c + * libogmrip/ogmrip-lavc.c + * libogmrip/ogmrip-lavc.h + * libogmrip/ogmrip-lavc-mpeg4.c + + Improved lavc support + +28 Feb 2008 Olivier Rolland + + * libogmrip/ogmrip-lavc.c + * libogmrip/ogmrip-lavc.h + * libogmrip/ogmrip-lavc-mpeg4.c + * libogmrip/ogmrip-lavc-mpeg4.h + * libogmrip/Makefile.am + + Added preliminary support for lavc video codecs + +26 Feb 2008 Olivier Rolland + + * libogmdvd/ogmdvd-title.c + * libogmdvd/ogmdvd-stream.c + * libogmdvd/ogmdvd-stream.h + + Improved DVD support + + * libogmrip/ogmrip-fs.c + * libogmrip/ogmrip-mplayer.c + * libogmrip/ogmrip-theora.c + * libogmrip/ogmrip-aac.c + * libogmrip/ogmrip-mp3.c + * libogmrip/ogmrip-vorbis.c + + Improved error handling (again) + +24 Feb 2008 Olivier Rolland + + * libogmrip/ogmrip-ogg.c + * libogmrip/ogmrip-mkv.c + + Fixed sync delay + + * libbacon/transport.hxx + + Fixed support for latest g++ + +27 Jan 2008 Olivier Rolland + + * libogmrip/ogmrip-x264.C + + Added codec specific options + + * src/ogmrip-profiles.c + * src/ogmrip-profiles.h + + Added checks for container and codecs + + * libogmrip/Makefile.am + * libogmrip/ogmrip-plugin.c + * libogmrip/ogmrip-plugin.h + * src/ogmrip-gconf.c + * src/ogmrip-gconf.h + + Improved plugins management + + * libogmrip/ogmrip-audio-codec.c + + Cleanup + + * data/Makefile.am + * data/ogmrip-profile-editor.glade + * data/ogmrip-x264.glade + * libogmrip-gtk/Makefile.am + * libogmrip-gtk/ogmrip-gtk.h + * libogmrip-gtk/ogmrip-options-plugin.c + * libogmrip-gtk/ogmrip-options-plugin.h + * libogmrip-gtk/ogmrip-x264-options.c + * src/ogmrip-main.c + * src/ogmrip-profile-editor.c + + Added preliminary support for per-codec options + + * data/ogmrip-pref.glade + * data/ogmrip.schemas.in + * src/ogmrip-pref.c + + Added preliminary support for expert mode + + * data/Makefile.am + * data/ogmrip-profile-editor.glade + * data/ogmrip-simple-editor.glade + * src/ogmrip-profile-editor.c + + Improved expert mode + +20 Jan 2008 Olivier Rolland + + * libogmrip/ogmrip-mplayer.c + * libogmrip/ogmrip-xvid.c + * libogmrip/ogmrip-mplayer.h + * libogmrip/ogmrip-xvid.h + * libogmrip/ogmrip-lavc.c + * libogmrip/ogmrip-lavc.h + * libogmrip/ogmrip-mp4.c + * libogmrip/ogmrip-vorbis.c + * libogmrip/ogmrip-srt.c + * libogmrip/ogmrip-vorbis.h + * libogmrip/ogmrip-ogg.c + * libogmrip/ogmrip-srt.h + * libogmrip/ogmrip-wav.c + * libogmrip/ogmrip-plugin.c + * libogmrip/ogmrip-wav.h + * libogmrip/ogmrip-x264.c + * libogmrip/ogmrip-plugin.h + * libogmrip/ogmrip.h + * libogmrip/ogmrip-x264.h + * libogmrip/ogmrip-acopy.c + * libogmrip/ogmrip-avi.c + * libogmrip/ogmrip-acopy.h + * libogmrip/ogmrip-theora.c + * libogmrip/ogmrip-aac.c + * libogmrip/ogmrip-subp-codec.c + * libogmrip/ogmrip-theora.h + * libogmrip/ogmrip-subp-codec.h + * libogmrip/ogmrip-aac.h + * libogmrip/ogmrip-mp3.c + * libogmrip/ogmrip-vobsub.c + * libogmrip/ogmrip-mp3.h + * libogmrip/ogmrip-vobsub.h + * libogmrip/ogmrip-audio-codec.c + * libogmrip/ogmrip-video-codec.c + * libogmrip/ogmrip-audio-codec.h + * libogmrip/ogmrip-container.c + * libogmrip/ogmrip-video-codec.h + * libogmrip/ogmrip-container.h + * libogmrip/ogmrip-dvdcpy.c + * libogmrip/Makefile.am + * libogmrip/ogmrip-mkv.c + * libogmrip/ogmrip-dvdcpy.h + * libogmrip/ogmrip-mov.c + * src/ogmrip-main.c + * src/ogmrip-options.c + + Improved API + + * dvdcpy/Makefile.am + * libogmdvd-gtk/Makefile.am + * subrip/Makefile.am + * libogmjob/Makefile.am + * Makefile.am + + Cleanup + +19 Jan 2008 Olivier Rolland + + * subrip/srtutil.c + + Improved error resiliency + Patch from Jakob Truelsen (antialize at users.sourceforge.net) + +16 Jan 2008 Olivier Rolland + + * libogmrip/ogmrip-fs.c + * libogmrip/ogmrip-fs.h + * src/ogmrip-main.c + + Improved error handling (again) + +15 Jan 2008 Olivier Rolland + + * src/ogmrip-main.c + + Fixed error handling + + * src/ogmrip-profiles.c + + Small UI improvement + +14 Jan 2008 Olivier Rolland + + * src/ogmrip-progress.c + * src/ogmrip-progress.h + * data/ogmrip-progress.data + + Improved progress dialog + + * libogmrip/ogmrip-mplayer.c + * libogmrip/ogmrip-ogg.c + * libogmrip/ogmrip-mkv.c + * src/ogmrip-main.c + + Fixed merge with empty streams + + * src/ogmrip-main.c + + Fixed crash + + * libogmrip/ogmrip-fs.c + * libogmrip/ogmrip-fs.h + * configure.in + + Improved error handling + +10 Jan 2008 Olivier Rolland + + * src/ogmrip-main.c + + Improved reuse of copied DVD (again) + + * src/ogmrip-profiles.c + + Small UI improvement + + * data/profiles.xml.in + * data/profiles.xml + * data/Makefile.am + * po/POTFILES.in + + Preliminary translation support of profiles name + + * src/ogmrip-main.c + + Improved support of directory structures + +06 Jan 2008 Olivier Rolland + + * data/Makefile.am + * data/ogmrip-options.glade + * data/ogmrip-pref.glade + * data/ogmrip-profile-editor.glade + * data/ogmrip-profiles.glade + * data/profiles.xml + * libogmrip-gtk/Makefile.am + * libogmrip-gtk/ogmrip-gtk.h + * libogmrip-gtk/ogmrip-marshal.list + * libogmrip-gtk/ogmrip-preferences.c + * libogmrip-gtk/ogmrip-preferences.h + * src/Makefile.am + * src/ogmrip-audio-options.c + * src/ogmrip-gconf.h + * src/ogmrip-main.c + * src/ogmrip-options.c + * src/ogmrip-pref.c + * src/ogmrip-profile-editor.c + * src/ogmrip-profile-editor.h + * src/ogmrip-profiles.c + * src/ogmrip-profiles.h + * src/ogmrip-subp-options.c + + Added support for profiles + + * libogmdvd/ogmdvd-disc.c + * libogmdvd/ogmdvd-disc.h + * libogmrip/ogmrip-fs.c + * src/ogmrip-main.c + + Improved reuse of copied DVD + +01 Jan 2008 Olivier Rolland + + * libogmdvd/ogmdvd-audio.c + * libogmdvd/ogmdvd-audio.h + * libogmdvd/ogmdvd-parser.c + * libogmdvd/ogmdvd-parser.h + * libogmdvd/ogmdvd-priv.h + * libogmdvd/ogmdvd-reader.h + * libogmdvd/ogmdvd-title.c + * libogmdvd/ogmdvd-title.h + + Fixed and improved title probing + + * libogmrip/ogmrip-plugin.c + + Fixed module close + + * libogmrip/Makefile.am + + Fixed lib dependencies + + * libogmrip/ogmrip-video.c + + Added properties + + * libogmrip-gtk/ogmrip-preferences.c + * libogmrip-gtk/ogmrip-preferences.h + + Improved API + + * libogmrip-gtk/ogmrip-source-chooser-widget.c + + Added support for audio bitrate + + * src/ogmrip-main.c + * src/ogmrip-gconf.c + * src/ogmrip-pref.c + * src/ogmrip-gconf.h + + Minor improvements + + * libogmrip/ogmrip-acopy.h + * libogmrip/ogmrip-avi.h + * libogmrip/ogmrip-theora.h + * libogmrip/ogmrip-aac.h + * libogmrip/ogmrip-mp3.h + * libogmrip/ogmrip-vobsub.h + * libogmrip/ogmrip-video.c + * libogmrip/ogmrip-vorbis.h + * libogmrip/ogmrip-srt.h + * libogmrip/ogmrip-ogg.h + * libogmrip/ogmrip-dvdcpy.h + + Cleanup + +22 Dec 2007 Olivier Rolland + + * libogmrip/ogmrip-x264.c + * libogmrip/ogmrip-mplayer.c + * libogmrip/ogmrip-xvid.c + * libogmrip/ogmrip-mplayer.h + * libogmrip/ogmrip-lavc.c + * libogmrip/ogmrip-video.c + * libogmrip/ogmrip-video.h + * src/ogmrip-main.c + + Moved n-pass support in the backend + + * dvdcpy/dvdcpy.c + + Improved error resiliency + +15 Dec 2007 Olivier Rolland + + * libogmrip/ogmrip-fs.c + * libogmjob/ogmjob-log.c + + Improved log + + * libogmdvd/ogmdvd-reader.c + + Fixed extraction by cells + +26 Nov 2007 Olivier Rolland + + * libogmjob/ogmjob-exec.c + + Fixed X cpu usage + +25 Nov 2007 Olivier Rolland + + * subrip/subp2pgm.c + * subrip/mp_msg.c + * subrip/mp_msg.h + * subrip/spudec.c + * subrip/spudec.h + * subrip/subrip.c + * subrip/vobsub.c + * subrip/vobsub.h + * subrip/Makefile.am - Released OGMRip-0.11.1 + Fixed ppm extraction +24 Nov 2007 Olivier Rolland + + * libogmrip/ogmrip-x264.c + * libogmrip/ogmrip-xvid.c + * libogmrip/ogmrip-lavc.c + * src/ogmrip-progress.c + * src/ogmrip-progress.h + * src/ogmrip-main.c + * src/ogmrip-options.c + * src/ogmrip-options.h + * data/ogmrip-options.glade + + Added preliminary support for automatic compressibility test + +20 Nov 2007 Olivier Rolland + + * libogmdvd/ogmdvd-reader.c + * libogmdvd/ogmdvd-reader.h + + Added cells support + +18 Nov 2007 Olivier Rolland + + * libogmrip/ogmrip-acopy.c + * libogmrip/ogmrip-file.c + * libogmrip/ogmrip-file.h + * libogmrip/ogmrip-mp3.c + * libogmrip/ogmrip-audio.c + * libogmrip/ogmrip-video.c + * libogmrip/ogmrip-container.c + + Improved overhead calculation + +16 Nov 2007 Olivier Rolland + + * libogmrip/ogmrip-video.c + + Improved autocrop (again) + +11 Nov 2007 Olivier Rolland + + * src/ogmrip-pref.c + + Fixed internationalization of plugin's descriptions + + * libogmrip/ogmrip-file.c + * libogmrip/ogmrip-avi.c + * libogmrip/ogmrip-enums.h + * libogmrip/ogmrip-mkv.c + * docs/reference/ogmrip/tmpl/ogmrip-enums.sgml + + Added support for Mpeg-1 and Mpeg-2 video files + +10 Nov 2007 Olivier Rolland + + * src/ogmrip-crop.c + + Improved frame grab + + * libogmrip/ogmrip-video.c + + Improved autocrop + +07 Nov 2007 Olivier Rolland + + * libogmrip/ogmrip-x264.c + * libogmrip/ogmrip-xvid.c + * libogmrip/ogmrip-lavc.c + * libogmrip/ogmrip-video.c + * libogmrip/ogmrip-video.h + + Added preliminary support for per-codec options + + * libogmrip/ogmrip-mp4.c + * libogmrip/ogmrip-mov.c + + Added support for mplayer >ٍ= 1.0rc2 + 21 Oct 2007 Olivier Rolland * src/ogmrip-prœgress.c Fixed ETA after suspend/resume +20 Oct 2007 Olivier Rolland + + * libogmdvd/Makefile.am + * libogmdvd/ogmdvd-contrib.c + * libogmdvd/ogmdvd-contrib.h + * libogmdvd/ogmdvd-disc.c + * libogmdvd/ogmdvd.h + * libogmdvd/ogmdvd-parser.c + * libogmdvd/ogmdvd-parser.h + * libogmdvd/ogmdvd-priv.h + * libogmdvd/ogmdvd-reader.c + * libogmdvd/ogmdvd-reader.h + * libogmdvd/ogmdvd-types.h + * docs/reference/ogmdvd/ogmdvd-sections.txt + * docs/reference/ogmdvd/ogmdvd.xml + * docs/reference/ogmdvd/tmpl/ogmdvd-disc.sgml + * docs/reference/ogmdvd/tmpl/ogmdvd-parser.sgml + * docs/reference/ogmdvd/tmpl/ogmdvd-reader.sgml + * docs/reference/ogmdvd/tmpl/ogmdvd-title.sgml + * docs/reference/ogmdvd/tmpl/ogmdvd-types.sgml + * docs/reference/ogmrip/ogmrip-sections.txt + * docs/reference/ogmrip/tmpl/ogmrip-codec.sgml + * docs/reference/ogmrip/tmpl/ogmrip-container.sgml + * docs/reference/ogmrip/tmpl/ogmrip-fs.sgml + * docs/reference/ogmrip/tmpl/ogmrip-unused.sgml + * docs/reference/ogmrip/tmpl/ogmrip-video.sgml + + Added functions to extract the bitrate of audio tracks + + * libogmrip/ogmrip-codec.c + * libogmrip/ogmrip-codec.h + * libogmrip/ogmrip-mplayer.c + * libogmrip/ogmrip-video.c + * libogmrip/ogmrip-video.h + * src/ogmrip-main.c + * src/ogmrip-options.c + * src/ogmrip-options.h + * data/ogmrip-options.glade + * docs/reference/ogmrip/ogmrip-sections.txt + * docs/reference/ogmrip/tmpl/ogmrip-codec.sgml + * docs/reference/ogmrip/tmpl/ogmrip-unused.sgml + + Improved support of telecine and progressive titles + + * libogmrip/ogmrip-x264.c + + Added support for auto threads + + * configure.in + + Added endianness detection + + * libogmrip/ogmrip-enums.h + * libogmrip/ogmrip-lavc.c + * libogmrip/ogmrip-video.c + * libogmrip/ogmrip-x264.c + * libogmrip/ogmrip-xvid.c + * data/ogmrip-pref.glade + * data/ogmrip.schemas.in + * docs/reference/ogmrip/tmpl/ogmrip-enums.sgml + + Renamed video quality presets + + * configure.in + + Starting 0.12 dev + 19 Oct 2007 Olivier Rolland + * libogmrip/ogmrip-mplayer.c + + Fixed progression with progressive titles + + * libogmrip/ogmrip-codec.c + * libogmrip/ogmrip-file.c + * src/ogmrip-main.c + + Cleanup + + * configure.in + + Typo + +16 Oct 2007 Olivier Rolland + * libogmdvd-gtk/ogmdvd-chapter-list.c * libogmdvd/ogmdvd-title.c * libogmdvd/ogmdvd-title.h @@ -26,10 +1141,6 @@ Fixed overhead calculation - * configure.in - - Typo - 14 Oct 2007 Olivier Rolland * libogmrip/ogmrip-mp3.c @@ -79,7 +1190,7 @@ 30 Sep 2007 Olivier Rolland - Released OGMRip-0.11.0 + Released OGMRip-0.11 30 Sep 2007 Olivier Rolland diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/config.guess /tmp/v6alHitLZN/ogmrip-0.12.2/config.guess --- ogmrip-0.11.1/config.guess 2007-10-21 21:05:58.000000000 +0200 +++ ogmrip-0.12.2/config.guess 2008-09-21 14:08:47.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-01-15' +timestamp='2008-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -347,7 +347,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -549,7 +549,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -808,12 +808,18 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -847,7 +853,14 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -968,8 +981,8 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-${LIBC} exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-${LIBC} + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -1490,9 +1503,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/config.h.in /tmp/v6alHitLZN/ogmrip-0.12.2/config.h.in --- ogmrip-0.11.1/config.h.in 2007-10-21 21:05:54.000000000 +0200 +++ ogmrip-0.12.2/config.h.in 2008-09-21 14:16:45.000000000 +0200 @@ -6,9 +6,6 @@ /* GetText Package */ #undef GETTEXT_PACKAGE -/* Define to 1 if faac is in PATH. */ -#undef HAVE_AAC_SUPPORT - /* Define to 1 if you have the `bind_textdomain_codeset' function. */ #undef HAVE_BIND_TEXTDOMAIN_CODESET @@ -18,16 +15,13 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if MPlayer is build with DTS support. */ -#undef HAVE_DTS_SUPPORT - /* Define to 1 if enchant is supported. */ #undef HAVE_ENCHANT_SUPPORT /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT -/* Define to 1 if gocr is in PATH. */ +/* Define to 1 if gocr is should be supported. */ #undef HAVE_GOCR_SUPPORT /* Define to 1 if gtk+ is supported. */ @@ -36,9 +30,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if MPlayer is build with lavf support. */ -#undef HAVE_LAVF_SUPPORT - /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES @@ -54,17 +45,14 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* Define to 1 if mkvmerge is in PATH. */ -#undef HAVE_MKV_SUPPORT - /* Define to 1 if you have the header file. */ #undef HAVE_MNTENT_H -/* Define to 1 if ocrad is in PATH. */ +/* Define to 1 if ocrad is should be supported. */ #undef HAVE_OCRAD_SUPPORT -/* Define to 1 if srt support is enabled. */ -#undef HAVE_SRT_SUPPORT +/* Define to 1 if png is supported. */ +#undef HAVE_PNG_SUPPORT /* Define to 1 if you have the `statvfs' function. */ #undef HAVE_STATVFS @@ -99,21 +87,18 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_VFSTAB_H -/* Define to 1 if theora is supported. */ -#undef HAVE_THEORA_SUPPORT +/* Define to 1 if tesseract is should be supported. */ +#undef HAVE_TESSERACT_SUPPORT + +/* Define to 1 if tiff is supported. */ +#undef HAVE_TIFF_SUPPORT /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if MPlayer is build with x264 support. */ -#undef HAVE_X264_SUPPORT - /* Locale directory */ #undef LOCALEDIR -/* mkvmerge major version number */ -#undef MKVMERGE_MAJOR_VERSION - /* Name of package */ #undef PACKAGE @@ -143,3 +128,7 @@ /* Version number of package */ #undef VERSION + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/config.sub /tmp/v6alHitLZN/ogmrip-0.12.2/config.sub --- ogmrip-0.11.1/config.sub 2007-10-21 21:05:58.000000000 +0200 +++ ogmrip-0.12.2/config.sub 2008-09-21 14:08:47.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-01-18' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -369,10 +369,14 @@ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -443,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -475,8 +487,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -668,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -683,6 +703,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -827,6 +851,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -1035,6 +1067,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/configure /tmp/v6alHitLZN/ogmrip-0.12.2/configure --- ogmrip-0.11.1/configure 2007-10-21 21:05:54.000000000 +0200 +++ ogmrip-0.12.2/configure 2008-09-21 14:16:38.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for OGMRip 0.11.1. +# Generated by GNU Autoconf 2.61 for OGMRip 0.12.2. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -726,8 +726,8 @@ # Identity of this package. PACKAGE_NAME='OGMRip' PACKAGE_TARNAME='ogmrip' -PACKAGE_VERSION='0.11.1' -PACKAGE_STRING='OGMRip 0.11.1' +PACKAGE_VERSION='0.12.2' +PACKAGE_STRING='OGMRip 0.12.2' PACKAGE_BUGREPORT='' ac_unique_file="src/ogmrip-main.c" @@ -845,6 +845,12 @@ CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE +CXX +CXXFLAGS +ac_ct_CXX +CXXDEPMODE +am__fastdepCXX_TRUE +am__fastdepCXX_FALSE build build_cpu build_vendor @@ -860,13 +866,9 @@ ECHO AR RANLIB +DSYMUTIL +NMEDIT CPP -CXX -CXXFLAGS -ac_ct_CXX -CXXDEPMODE -am__fastdepCXX_TRUE -am__fastdepCXX_FALSE CXXCPP F77 FFLAGS @@ -877,6 +879,7 @@ MAINT HTML_DIR PKG_CONFIG +GTKDOC_CHECK ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE @@ -886,6 +889,15 @@ HAVE_XSLTPROC_PROG_FALSE OGMRIP_CFLAGS OGMRIP_LIBS +LIBXML_CFLAGS +LIBXML_LIBS +LIBPNG_CFLAGS +LIBPNG_LIBS +HAVE_PNG_SUPPORT_TRUE +HAVE_PNG_SUPPORT_FALSE +LIBTIFF_LIBS +HAVE_TIFF_SUPPORT_TRUE +HAVE_TIFF_SUPPORT_FALSE SED_PROG GUI_CFLAGS GUI_LIBS @@ -905,33 +917,31 @@ DVDREAD_LIBS EJECT_PROG MPLAYER_PROG -MPLAYER_MAJOR_VERSION -MPLAYER_MINOR_VERSION -MPLAYER_PRE_VERSION -MPLAYER_RC_VERSION MENCODER_PROG -OGMMERGE_PROG -OGMSPLIT_PROG -OGGENC_PROG -LAME_PROG -HAVE_X264_SUPPORT_TRUE -HAVE_X264_SUPPORT_FALSE -HAVE_LAVF_SUPPORT_TRUE -HAVE_LAVF_SUPPORT_FALSE -HAVE_DTS_SUPPORT_TRUE -HAVE_DTS_SUPPORT_FALSE -FAAC_PROG -HAVE_AAC_SUPPORT_TRUE -HAVE_AAC_SUPPORT_FALSE -MKVMERGE_PROG +HAVE_OGM_SUPPORT_TRUE +HAVE_OGM_SUPPORT_FALSE HAVE_MKV_SUPPORT_TRUE HAVE_MKV_SUPPORT_FALSE +HAVE_MP4_SUPPORT_TRUE +HAVE_MP4_SUPPORT_FALSE +HAVE_LAVF_SUPPORT_TRUE +HAVE_LAVF_SUPPORT_FALSE +HAVE_XVID_SUPPORT_TRUE +HAVE_XVID_SUPPORT_FALSE +HAVE_LAVC_SUPPORT_TRUE +HAVE_LAVC_SUPPORT_FALSE +HAVE_X264_SUPPORT_TRUE +HAVE_X264_SUPPORT_FALSE THEORA_CFLAGS THEORA_LIBS HAVE_THEORA_SUPPORT_TRUE HAVE_THEORA_SUPPORT_FALSE -GOCR_PROG -OCRAD_PROG +HAVE_VORBIS_SUPPORT_TRUE +HAVE_VORBIS_SUPPORT_FALSE +HAVE_MP3_SUPPORT_TRUE +HAVE_MP3_SUPPORT_FALSE +HAVE_AAC_SUPPORT_TRUE +HAVE_AAC_SUPPORT_FALSE HAVE_SRT_SUPPORT_TRUE HAVE_SRT_SUPPORT_FALSE LIBNOTIFY_CFLAGS @@ -971,14 +981,12 @@ INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE +INTLTOOL_POLICY_RULE +MSGMERGE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL -INTLTOOL_ICONV -INTLTOOL_MSGFMT -INTLTOOL_MSGMERGE -INTLTOOL_XGETTEXT ALL_LINGUAS GLIB_GENMARSHAL OGMDVD_LT_VERSION @@ -997,16 +1005,20 @@ LDFLAGS LIBS CPPFLAGS -CPP CXX CXXFLAGS CCC +CPP CXXCPP F77 FFLAGS PKG_CONFIG OGMRIP_CFLAGS OGMRIP_LIBS +LIBXML_CFLAGS +LIBXML_LIBS +LIBPNG_CFLAGS +LIBPNG_LIBS GUI_CFLAGS GUI_LIBS HAL_CFLAGS @@ -1519,7 +1531,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OGMRip 0.11.1 to adapt to many kinds of systems. +\`configure' configures OGMRip 0.12.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1589,7 +1601,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OGMRip 0.11.1:";; + short | recursive ) echo "Configuration of OGMRip 0.12.2:";; esac cat <<\_ACEOF @@ -1605,17 +1617,25 @@ --disable-libtool-lock avoid locking (might break parallel builds) --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-gtk-doc use gtk-doc to build documentation default=no + --enable-gtk-doc use gtk-doc to build documentation [default=no] --disable-gtk-support disable GTK+ support --disable-schemas-install Disable the schemas installation --disable-hal-support disable HAL support --disable-enchant-support disable Enchant support - --disable-aac-support disable AAC support - --disable-matroska-support - disable Matroska support + --disable-ogm-support disable OGM support + --disable-mkv-support disable Matroska support + --disable-mp4-support disable Mpeg-4 support + --disable-lavf-support disable Lavf support + --disable-xvid-support disable XviD support + --disable-lavc-support disable Lavc support + --disable-x264-support disable X264 support --disable-theora-support disable Theora support + --disable-vorbis-support + disable Ogg Vorbis support + --disable-mp3-support disable Mp3 support + --disable-aac-support disable AAC support --disable-srt-support disable SRT support --disable-libnotify-support disable libnotify support @@ -1630,10 +1650,7 @@ --with-html-dir=PATH path to installed docs --with-gconf-source=sourceaddress Config database for installing schema files. --with-gconf-schema-file-dir=dir Directory for installing schema files. - --with-mplayer-version=n.m((pre|rc)p)? - Force the version number of mplayer (i.e. 0.94, - 1.0pre1, 1.0rc1, ...) - --with-ocr=auto|gocr|ocrad + --with-ocr=auto|gocr|ocrad|tesseract Select the OCR program to use (default gocr) Some influential environment variables: @@ -1644,9 +1661,9 @@ LIBS libraries to pass to the linker, e.g. -l CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory - CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags + CPP C preprocessor CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags @@ -1654,6 +1671,12 @@ OGMRIP_CFLAGS C compiler flags for OGMRIP, overriding pkg-config OGMRIP_LIBS linker flags for OGMRIP, overriding pkg-config + LIBXML_CFLAGS + C compiler flags for LIBXML, overriding pkg-config + LIBXML_LIBS linker flags for LIBXML, overriding pkg-config + LIBPNG_CFLAGS + C compiler flags for LIBPNG, overriding pkg-config + LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config GUI_CFLAGS C compiler flags for GUI, overriding pkg-config GUI_LIBS linker flags for GUI, overriding pkg-config HAL_CFLAGS C compiler flags for HAL, overriding pkg-config @@ -1733,7 +1756,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OGMRip configure 0.11.1 +OGMRip configure 0.12.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1747,7 +1770,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OGMRip $as_me 0.11.1, which was +It was created by OGMRip $as_me 0.12.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2418,7 +2441,7 @@ # Define the identity of the package. PACKAGE=ogmrip - VERSION=0.11.1 + VERSION=0.12.2 cat >>confdefs.h <<_ACEOF @@ -2571,9 +2594,9 @@ OGMRIP_MAJOR_VERSION=0 -OGMRIP_MINOR_VERSION=11 -OGMRIP_MICRO_VERSION=1 -OGMRIP_VERSION=0.11.1 +OGMRIP_MINOR_VERSION=12 +OGMRIP_MICRO_VERSION=2 +OGMRIP_VERSION=0.12.2 @@ -3673,1522 +3696,1493 @@ fi -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done IFS=$as_save_IFS - fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -# Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - enable_shared=yes + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -# Check whether --enable-static was given. -if test "${enable_static+set}" = set; then - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=yes + test -n "$CXX" && break + done fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - -# Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } else - enable_fast_install=yes + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } + test -n "$ac_ct_CXX" && break +done -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi + fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +# Provide some information about the compiler. +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu -{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } -if test "${lt_cv_path_SED+set}" = set; then +fi +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } +GXX=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } +if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -fi +int +main () +{ -SED=$lt_cv_path_SED + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -{ echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6; } + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_GREP_found && break 3 - done -done - -done -IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi +int +main () +{ + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : else - ac_cv_path_GREP=$GREP -fi - + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int +main () +{ -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac - - - $ac_path_EGREP_found && break 3 - done -done - -done -IFS=$as_save_IFS +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 fi -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -else - ac_cv_path_EGREP=$EGREP +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - - fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +depcc="$CXX" am_compiler_list= -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - with_gnu_ld=no -fi + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } -else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } -fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 /dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi fi done - IFS="$lt_save_ifs" + + cd .. + rm -rf conftest.dir else - lt_cv_path_LD="$LD" # Let the user override the test with a path. -fi + am_cv_CXX_dependencies_compiler_type=none fi -LD="$lt_cv_path_LD" -if test -n "$LD"; then - { echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + + +if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld -{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_cv_ld_reload_flag='-r' -fi -{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + done + done ;; esac +done +IFS=$as_save_IFS -{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } -if test "${lt_cv_path_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi -fi -{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6; } -NM="$lt_cv_path_NM" - -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } fi +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } -{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -case $host_os in -aix4* | aix5*) - lt_cv_deplibs_check_method=pass_all - ;; +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -beos*) - lt_cv_deplibs_check_method=pass_all - ;; +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; +# Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_shared=yes +fi -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_static=yes +fi -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` +# Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" ;; esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; +else + enable_fast_install=yes +fi -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { (exit 1); exit 1; }; } -interix[3-9]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { (exit 1); exit 1; }; } -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; +fi +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -# This must be Linux ELF. -linux* | k*bsd*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; -netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi - ;; +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } +fi -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; +fi +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -nto-qnx*) - lt_cv_deplibs_check_method=unknown - ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } +if test "${lt_cv_path_SED+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; +fi -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; +SED=$lt_cv_path_SED -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; +{ echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6; } -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac -fi -{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown + $ac_path_GREP_found && break 3 + done +done +done +IFS=$as_save_IFS -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +fi -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi -# Allow CC to be a program name with arguments. -compiler=$CC +else + ac_cv_path_GREP=$GREP +fi -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '#line 4564 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - lt_cv_cc_needs_belf=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi +else + ac_cv_path_EGREP=$EGREP fi -{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac + fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -need_locks="$enable_libtool_lock" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue + with_gnu_ld=no fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } +fi +if test "${lt_cv_path_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +echo "${ECHO_T}$LD" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi +test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } +if test "${lt_cv_prog_gnu_ld+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld - done - ac_cv_prog_CPP=$CPP -fi - CPP=$ac_cv_prog_CPP +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } +if test "${lt_cv_ld_reload_flag+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_CPP=$CPP + lt_cv_ld_reload_flag='-r' fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } +if test "${lt_cv_path_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm +fi fi +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +echo "${ECHO_T}$lt_cv_path_NM" >&6; } +NM="$lt_cv_path_NM" -rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } +fi - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue +{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } +if test "${lt_cv_deplibs_check_method+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# `unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# which responds to the $file_magic_cmd with a given extended regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. - # Passes both tests. -ac_preproc_ok=: -break -fi +case $host_os in +aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; -rm -f conftest.err conftest.$ac_ext +beos*) + lt_cv_deplibs_check_method=pass_all + ;; -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi +bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; -int -main () -{ +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; - ac_cv_header_stdc=no -fi +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* +# This must be Linux ELF. +linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; -fi +netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* +nto-qnx*) + lt_cv_deplibs_check_method=unknown + ;; -fi +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; +esac fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF -fi -# On IRIX 5.3, sys/types and inttypes.h are conflicting. +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +# Allow CC to be a program name with arguments. +compiler=$CC +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then + enableval=$enable_libtool_lock; +fi +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '#line 5060 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } +if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +int +main () +{ + + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5197,95 +5191,138 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu fi +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; -done +esac +need_locks="$enable_libtool_lock" -for ac_header in dlfcn.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + }; then + : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + # Broken: fails on valid input. +continue fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.err conftest.$ac_ext -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -5303,216 +5340,147 @@ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then - ac_header_preproc=yes + # Broken: success on invalid input. +continue else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + # Passes both tests. +ac_preproc_ok=: +break fi rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - test -n "$ac_ct_CXX" && break done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break fi - fi -fi -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } +if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -5521,13 +5489,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include +#include +#include +#include int main () { -#ifndef __GNUC__ - choke me -#endif ; return 0; @@ -5547,49 +5516,170 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes + ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_compiler_gnu=no -fi + ac_cv_header_stdc=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +$ac_includes_default -int -main () -{ - - ; - return 0; -} +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -5605,29 +5695,57 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + +for ac_header in dlfcn.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +$ac_includes_default +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -5643,196 +5761,105 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - : + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes + }; then + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi + ac_header_preproc=no fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - cd .. - rm -rf conftest.dir + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - am_cv_CXX_dependencies_compiler_type=none + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi -{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= fi +done @@ -6331,7 +6358,6 @@ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! - # find the maximum length of command line arguments { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } @@ -6646,7 +6672,7 @@ echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 fi - rm -f conftest* conftst* + rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then @@ -7202,9 +7228,321 @@ fi fi - fi - ;; -esac + fi + ;; +esac + + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 +echo "${ECHO_T}$DSYMUTIL" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 +echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { echo "$as_me:$LINENO: result: $NMEDIT" >&5 +echo "${ECHO_T}$NMEDIT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 +echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + NMEDIT=$ac_ct_NMEDIT + fi +else + NMEDIT="$ac_cv_prog_NMEDIT" +fi + + + { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 +echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } +if test "${lt_cv_apple_cc_single_mod+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi +fi +{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } + { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 +echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + lt_cv_ld_exported_symbols_list=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + lt_cv_ld_exported_symbols_list=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[0123]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac + enable_dlopen=no enable_win32_dll=no @@ -7249,7 +7587,7 @@ " >&2;} { (exit 1); exit 1; }; } fi -gentoo_lt_version="1.5.24" +gentoo_lt_version="1.5.26" gentoo_ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' "$ltmain"` if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then { echo "$as_me:$LINENO: result: no" >&5 @@ -7332,7 +7670,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* @@ -7360,11 +7698,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7363: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7701: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7367: \$? = $ac_status" >&5 + echo "$as_me:7705: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7634,10 +7972,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works=no + lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic -DPIC" @@ -7650,27 +7988,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7653: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7991: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7657: \$? = $ac_status" >&5 + echo "$as_me:7995: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works=yes + lt_cv_prog_compiler_pic_works=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_prog_compiler_pic_works" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -7697,10 +8035,10 @@ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works+set}" = set; then +if test "${lt_cv_prog_compiler_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works=no + lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -7713,20 +8051,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works=yes + lt_cv_prog_compiler_static_works=yes fi else - lt_prog_compiler_static_works=yes + lt_cv_prog_compiler_static_works=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_prog_compiler_static_works" = xyes; then +if test x"$lt_cv_prog_compiler_static_works" = xyes; then : else lt_prog_compiler_static= @@ -7754,11 +8092,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7757: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8095: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7761: \$? = $ac_status" >&5 + echo "$as_me:8099: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7838,12 +8176,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -7902,7 +8241,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no @@ -8121,7 +8460,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -8141,7 +8480,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -8413,11 +8752,10 @@ link_all_deplibs=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -8937,7 +9275,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -9472,6 +9810,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -9791,7 +10144,7 @@ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else { echo "$as_me:$LINENO: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } @@ -10067,7 +10420,7 @@ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -10116,7 +10469,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -11187,7 +11546,7 @@ # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -11200,7 +11559,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) @@ -11458,51 +11817,23 @@ fi ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac archive_cmds_need_lc_CXX=no hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported whole_archive_flag_spec_CXX='' link_all_deplibs_CXX=yes - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + if test "$GXX" = yes ; then output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else case $cc_basename in xlc*) @@ -11753,7 +12084,7 @@ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' @@ -12160,7 +12491,6 @@ GCC_CXX="$GXX" LD_CXX="$LD" - cat > conftest.$ac_ext <&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_CXX=no + lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" @@ -12636,27 +12970,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12639: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12973: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12643: \$? = $ac_status" >&5 + echo "$as_me:12977: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_CXX=yes + lt_cv_prog_compiler_pic_works_CXX=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } -if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in "" | " "*) ;; *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; @@ -12683,10 +13017,10 @@ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_CXX=no + lt_cv_prog_compiler_static_works_CXX=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -12699,20 +13033,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_CXX=yes + lt_cv_prog_compiler_static_works_CXX=yes fi else - lt_prog_compiler_static_works_CXX=yes + lt_cv_prog_compiler_static_works_CXX=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } -if test x"$lt_prog_compiler_static_works_CXX" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then : else lt_prog_compiler_static_CXX= @@ -12740,11 +13074,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12743: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13077: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12747: \$? = $ac_status" >&5 + echo "$as_me:13081: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12797,7 +13131,7 @@ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix4* | aix5*) + aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then @@ -12816,6 +13150,7 @@ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 echo "${ECHO_T}$ld_shlibs_CXX" >&6; } @@ -12917,7 +13252,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -13451,6 +13786,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -13534,6 +13884,7 @@ predeps_CXX \ postdeps_CXX \ compiler_lib_search_path_CXX \ + compiler_lib_search_dirs_CXX \ archive_cmds_CXX \ archive_expsym_cmds_CXX \ postinstall_cmds_CXX \ @@ -13782,6 +14133,10 @@ # shared library. postdeps=$lt_postdeps_CXX +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_CXX @@ -13996,7 +14351,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -14034,7 +14389,7 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4* | aix5*) +aix[4-9]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -14299,10 +14654,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_F77+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_F77=no + lt_cv_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_F77" @@ -14315,27 +14670,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14318: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14673: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14322: \$? = $ac_status" >&5 + echo "$as_me:14677: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_F77=yes + lt_cv_prog_compiler_pic_works_F77=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } -if test x"$lt_prog_compiler_pic_works_F77" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in "" | " "*) ;; *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; @@ -14362,10 +14717,10 @@ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_F77+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_F77=no + lt_cv_prog_compiler_static_works_F77=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -14378,20 +14733,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_F77=yes + lt_cv_prog_compiler_static_works_F77=yes fi else - lt_prog_compiler_static_works_F77=yes + lt_cv_prog_compiler_static_works_F77=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } -if test x"$lt_prog_compiler_static_works_F77" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then : else lt_prog_compiler_static_F77= @@ -14419,11 +14774,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14422: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14777: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14426: \$? = $ac_status" >&5 + echo "$as_me:14781: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14503,12 +14858,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -14567,7 +14923,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs_F77=no @@ -14786,7 +15142,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -14806,7 +15162,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -15058,11 +15414,10 @@ link_all_deplibs_F77=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -15531,7 +15886,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -16065,6 +16420,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -16148,6 +16518,7 @@ predeps_F77 \ postdeps_F77 \ compiler_lib_search_path_F77 \ + compiler_lib_search_dirs_F77 \ archive_cmds_F77 \ archive_expsym_cmds_F77 \ postinstall_cmds_F77 \ @@ -16396,6 +16767,10 @@ # shared library. postdeps=$lt_postdeps_F77 +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_F77 @@ -16570,7 +16945,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -16619,11 +16994,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16622: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16997: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16626: \$? = $ac_status" >&5 + echo "$as_me:17001: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16683,7 +17058,7 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; darwin* | rhapsody*) @@ -16753,7 +17128,7 @@ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; hpux9* | hpux10* | hpux11*) @@ -16893,10 +17268,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_GCJ=no + lt_cv_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_GCJ" @@ -16909,27 +17284,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16912: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17287: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16916: \$? = $ac_status" >&5 + echo "$as_me:17291: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_GCJ=yes + lt_cv_prog_compiler_pic_works_GCJ=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } -if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in "" | " "*) ;; *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; @@ -16956,10 +17331,10 @@ wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_GCJ=no + lt_cv_prog_compiler_static_works_GCJ=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -16972,20 +17347,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_GCJ=yes + lt_cv_prog_compiler_static_works_GCJ=yes fi else - lt_prog_compiler_static_works_GCJ=yes + lt_cv_prog_compiler_static_works_GCJ=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } -if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then : else lt_prog_compiler_static_GCJ= @@ -17013,11 +17388,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17016: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17391: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17020: \$? = $ac_status" >&5 + echo "$as_me:17395: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17097,12 +17472,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -17161,7 +17537,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs_GCJ=no @@ -17380,7 +17756,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -17400,7 +17776,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -17672,11 +18048,10 @@ link_all_deplibs_GCJ=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -18145,7 +18520,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -18679,6 +19054,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -18762,6 +19152,7 @@ predeps_GCJ \ postdeps_GCJ \ compiler_lib_search_path_GCJ \ + compiler_lib_search_dirs_GCJ \ archive_cmds_GCJ \ archive_expsym_cmds_GCJ \ postinstall_cmds_GCJ \ @@ -19010,6 +19401,10 @@ # shared library. postdeps=$lt_postdeps_GCJ +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ @@ -19183,7 +19578,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -19243,6 +19638,7 @@ predeps_RC \ postdeps_RC \ compiler_lib_search_path_RC \ + compiler_lib_search_dirs_RC \ archive_cmds_RC \ archive_expsym_cmds_RC \ postinstall_cmds_RC \ @@ -19491,6 +19887,10 @@ # shared library. postdeps=$lt_postdeps_RC +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_RC @@ -19751,31 +20151,263 @@ fi -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + +{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } +if test "${ac_cv_c_bigendian+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # See if sys/param.h defines the BYTE_ORDER macro. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include + +int +main () +{ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ + && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) + bogus endian macros +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + # It does; now see whether it defined to BIG_ENDIAN or not. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include + +int +main () +{ +#if BYTE_ORDER != BIG_ENDIAN + not big endian +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_c_bigendian=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_bigendian=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # It does not; compile a test program. +if test "$cross_compiling" = yes; then + # try to guess the endianness by grepping values into an object file + ac_cv_c_bigendian=unknown cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - +short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } +short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } +int +main () +{ + _ascii (); _ebcdic (); + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then + ac_cv_c_bigendian=yes fi -rm -f conftest* +if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi +fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -19783,28 +20415,21 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +$ac_includes_default int main () { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; + + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; + + ; return 0; } _ACEOF @@ -19828,30 +20453,41 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + ac_cv_c_bigendian=no else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -ac_cv_header_stdc=no +ac_cv_c_bigendian=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } +case $ac_cv_c_bigendian in + yes) cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 +#define WORDS_BIGENDIAN 1 _ACEOF - -fi + ;; + no) + ;; + *) + { { echo "$as_me:$LINENO: error: unknown endianness +presetting ac_cv_c_bigendian=no (or yes) will help" >&5 +echo "$as_me: error: unknown endianness +presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} + { (exit 1); exit 1; }; } ;; +esac { echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 @@ -20045,253 +20681,83 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - - - -# Check whether --with-html-dir was given. -if test "${with_html_dir+set}" = set; then - withval=$with_html_dir; -else - with_html_dir='${datadir}/gtk-doc/html' -fi - - HTML_DIR="$with_html_dir" - - - # Check whether --enable-gtk-doc was given. -if test "${enable_gtk_doc+set}" = set; then - enableval=$enable_gtk_doc; -else - enable_gtk_doc=no -fi - - - have_gtk_doc=no - if test x$enable_gtk_doc = xyes; then - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - fi - if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then - have_gtk_doc=yes - fi - - gtk_doc_min_version=1.0 - if test "$have_gtk_doc" = yes; then - { echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5 -echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6; } - if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - have_gtk_doc=no - fi - fi - - if test "$have_gtk_doc" != yes; then - enable_gtk_doc=no - fi - fi - - - -if test x$enable_gtk_doc = xyes; then - ENABLE_GTK_DOC_TRUE= - ENABLE_GTK_DOC_FALSE='#' -else - ENABLE_GTK_DOC_TRUE='#' - ENABLE_GTK_DOC_FALSE= -fi - - + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func -if test -n "$LIBTOOL"; then - GTK_DOC_USE_LIBTOOL_TRUE= - GTK_DOC_USE_LIBTOOL_FALSE='#' -else - GTK_DOC_USE_LIBTOOL_TRUE='#' - GTK_DOC_USE_LIBTOOL_FALSE= -fi +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func -if test x"$have_gtk_doc" = x"yes"; then - # Extract the first word of "xsltproc", so it can be a program name with args. -set dummy xsltproc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_XSLTPROC_PROG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $XSLTPROC_PROG in - [\\/]* | ?:[\\/]*) - ac_cv_path_XSLTPROC_PROG="$XSLTPROC_PROG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_XSLTPROC_PROG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif - ;; +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -XSLTPROC_PROG=$ac_cv_path_XSLTPROC_PROG -if test -n "$XSLTPROC_PROG"; then - { echo "$as_me:$LINENO: result: $XSLTPROC_PROG" >&5 -echo "${ECHO_T}$XSLTPROC_PROG" >&6; } +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - if test x"$XSLTPROC_PROG" = x; then - { { echo "$as_me:$LINENO: error: Unable to find xsltproc in the PATH. You need xsltproc to build the tutorial. Find it on http://www.xmlsoft.org" >&5 -echo "$as_me: error: Unable to find xsltproc in the PATH. You need xsltproc to build the tutorial. Find it on http://www.xmlsoft.org" >&2;} - { (exit 1); exit 1; }; } - fi + eval "$as_ac_var=no" fi +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF - -if test x"$XSLTPROC_PROG" != x""; then - HAVE_XSLTPROC_PROG_TRUE= - HAVE_XSLTPROC_PROG_FALSE='#' -else - HAVE_XSLTPROC_PROG_TRUE='#' - HAVE_XSLTPROC_PROG_FALSE= fi +done @@ -20416,178 +20882,57 @@ fi -GLIB_REQUIRED=2.6.0 -GOBJECT_REQUIRED=2.6.0 -GMODULE_REQUIRED=2.6.0 - -OGMRIP_MODULES="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GOBJECT_REQUIRED gmodule-2.0 >= $GMODULE_REQUIRED enca" - - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for OGMRIP" >&5 -echo $ECHO_N "checking for OGMRIP... $ECHO_C" >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$OGMRIP_CFLAGS"; then - pkg_cv_OGMRIP_CFLAGS="$OGMRIP_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$OGMRIP_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "$OGMRIP_MODULES") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_OGMRIP_CFLAGS=`$PKG_CONFIG --cflags "$OGMRIP_MODULES" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$OGMRIP_LIBS"; then - pkg_cv_OGMRIP_LIBS="$OGMRIP_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$OGMRIP_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "$OGMRIP_MODULES") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_OGMRIP_LIBS=`$PKG_CONFIG --libs "$OGMRIP_MODULES" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - OGMRIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$OGMRIP_MODULES"` - else - OGMRIP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$OGMRIP_MODULES"` - fi - # Put the nasty error message in config.log where it belongs - echo "$OGMRIP_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements ($OGMRIP_MODULES) were not met: - -$OGMRIP_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables OGMRIP_CFLAGS -and OGMRIP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements ($OGMRIP_MODULES) were not met: - -$OGMRIP_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables OGMRIP_CFLAGS -and OGMRIP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables OGMRIP_CFLAGS -and OGMRIP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables OGMRIP_CFLAGS -and OGMRIP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else - OGMRIP_CFLAGS=$pkg_cv_OGMRIP_CFLAGS - OGMRIP_LIBS=$pkg_cv_OGMRIP_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : -fi - - - -# Extract the first word of "gsed", so it can be a program name with args. -set dummy gsed; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_SED_PROG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --with-html-dir was given. +if test "${with_html_dir+set}" = set; then + withval=$with_html_dir; else - case $SED_PROG in - [\\/]* | ?:[\\/]*) - ac_cv_path_SED_PROG="$SED_PROG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_SED_PROG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + with_html_dir='${datadir}/gtk-doc/html' +fi - ;; -esac + HTML_DIR="$with_html_dir" + + + # Check whether --enable-gtk-doc was given. +if test "${enable_gtk_doc+set}" = set; then + enableval=$enable_gtk_doc; +else + enable_gtk_doc=no fi -SED_PROG=$ac_cv_path_SED_PROG -if test -n "$SED_PROG"; then - { echo "$as_me:$LINENO: result: $SED_PROG" >&5 -echo "${ECHO_T}$SED_PROG" >&6; } + + + if test x$enable_gtk_doc = xyes; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + : else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&5 +echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&2;} + { (exit 1); exit 1; }; } fi + fi + { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 +echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 +echo "${ECHO_T}$enable_gtk_doc" >&6; } -if test x"$SED_PROG" = x; then - # Extract the first word of "sed", so it can be a program name with args. -set dummy sed; ac_word=$2 + for ac_prog in gtkdoc-check +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_SED_PROG+set}" = set; then +if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $SED_PROG in + case $GTKDOC_CHECK in [\\/]* | ?:[\\/]*) - ac_cv_path_SED_PROG="$SED_PROG" # Let the user override the test with a path. + ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -20597,7 +20942,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_SED_PROG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -20608,128 +20953,53 @@ ;; esac fi -SED_PROG=$ac_cv_path_SED_PROG -if test -n "$SED_PROG"; then - { echo "$as_me:$LINENO: result: $SED_PROG" >&5 -echo "${ECHO_T}$SED_PROG" >&6; } +GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 +echo "${ECHO_T}$GTKDOC_CHECK" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi -fi -if ! "$SED_PROG" --version 2> /dev/null | head -n 1 | grep -q "GNU sed"; then - { { echo "$as_me:$LINENO: error: Unable to find GNU sed in the PATH. You need GNU sed to configure OGMRip. Find it on ftp://ftp.gnu.org/gnu/sed" >&5 -echo "$as_me: error: Unable to find GNU sed in the PATH. You need GNU sed to configure OGMRip. Find it on ftp://ftp.gnu.org/gnu/sed" >&2;} - { (exit 1); exit 1; }; } -fi - - -GTK_REQUIRED=2.6.0 -LIBGLADE_REQUIRED=2.5.0 -GCONF_REQUIRED=2.6.0 - -GUI_MODULES="gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" - -# Check whether --enable-gtk-support was given. -if test "${enable_gtk_support+set}" = set; then - enableval=$enable_gtk_support; have_gtk_support="$enableval" -else - have_gtk_support="yes" -fi + test -n "$GTKDOC_CHECK" && break +done -if test x"$have_gtk_support" != x"no"; then -pkg_failed=no -{ echo "$as_me:$LINENO: checking for GUI" >&5 -echo $ECHO_N "checking for GUI... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GUI_CFLAGS"; then - pkg_cv_GUI_CFLAGS="$GUI_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GUI_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "$GUI_MODULES") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GUI_CFLAGS=`$PKG_CONFIG --cflags "$GUI_MODULES" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$GUI_LIBS"; then - pkg_cv_GUI_LIBS="$GUI_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GUI_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "$GUI_MODULES") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GUI_LIBS=`$PKG_CONFIG --libs "$GUI_MODULES" 2>/dev/null` -else - pkg_failed=yes -fi - fi +if test x$enable_gtk_doc = xyes; then + ENABLE_GTK_DOC_TRUE= + ENABLE_GTK_DOC_FALSE='#' else - pkg_failed=untried + ENABLE_GTK_DOC_TRUE='#' + ENABLE_GTK_DOC_FALSE= fi -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GUI_MODULES"` - else - GUI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GUI_MODULES"` - fi - # Put the nasty error message in config.log where it belongs - echo "$GUI_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - have_gtk_support=no -elif test $pkg_failed = untried; then - have_gtk_support=no +if test -n "$LIBTOOL"; then + GTK_DOC_USE_LIBTOOL_TRUE= + GTK_DOC_USE_LIBTOOL_FALSE='#' else - GUI_CFLAGS=$pkg_cv_GUI_CFLAGS - GUI_LIBS=$pkg_cv_GUI_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - have_gtk_support=yes -fi + GTK_DOC_USE_LIBTOOL_TRUE='#' + GTK_DOC_USE_LIBTOOL_FALSE= fi -if test x"$have_gtk_support" = x"yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_GTK_SUPPORT 1 -_ACEOF - # Extract the first word of "gconftool-2", so it can be a program name with args. -set dummy gconftool-2; ac_word=$2 +if test x"$enable_gtk_doc" = x"yes"; then + # Extract the first word of "xsltproc", so it can be a program name with args. +set dummy xsltproc; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_GCONFTOOL+set}" = set; then +if test "${ac_cv_path_XSLTPROC_PROG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $GCONFTOOL in + case $XSLTPROC_PROG in [\\/]* | ?:[\\/]*) - ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path. + ac_cv_path_XSLTPROC_PROG="$XSLTPROC_PROG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -20739,7 +21009,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_XSLTPROC_PROG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -20750,100 +21020,59 @@ ;; esac fi -GCONFTOOL=$ac_cv_path_GCONFTOOL -if test -n "$GCONFTOOL"; then - { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5 -echo "${ECHO_T}$GCONFTOOL" >&6; } +XSLTPROC_PROG=$ac_cv_path_XSLTPROC_PROG +if test -n "$XSLTPROC_PROG"; then + { echo "$as_me:$LINENO: result: $XSLTPROC_PROG" >&5 +echo "${ECHO_T}$XSLTPROC_PROG" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi - - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` - else - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE - fi - - -# Check whether --with-gconf-source was given. -if test "${with_gconf_source+set}" = set; then - withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval" -fi - - - - { echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 -echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } - - if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then - GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' + if test x"$XSLTPROC_PROG" = x; then + { { echo "$as_me:$LINENO: error: Unable to find xsltproc in the PATH. You need xsltproc to build the tutorial. Find it on http://www.xmlsoft.org" >&5 +echo "$as_me: error: Unable to find xsltproc in the PATH. You need xsltproc to build the tutorial. Find it on http://www.xmlsoft.org" >&2;} + { (exit 1); exit 1; }; } fi - - -# Check whether --with-gconf-schema-file-dir was given. -if test "${with_gconf_schema_file_dir+set}" = set; then - withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval" fi - { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 -echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } - - # Check whether --enable-schemas-install was given. -if test "${enable_schemas_install+set}" = set; then - enableval=$enable_schemas_install; case ${enableval} in - yes|no) ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;} - { (exit 1); exit 1; }; } ;; - esac +if test x"$XSLTPROC_PROG" != x""; then + HAVE_XSLTPROC_PROG_TRUE= + HAVE_XSLTPROC_PROG_FALSE='#' +else + HAVE_XSLTPROC_PROG_TRUE='#' + HAVE_XSLTPROC_PROG_FALSE= fi -if test "$enable_schemas_install" != no; then - GCONF_SCHEMAS_INSTALL_TRUE= - GCONF_SCHEMAS_INSTALL_FALSE='#' -else - GCONF_SCHEMAS_INSTALL_TRUE='#' - GCONF_SCHEMAS_INSTALL_FALSE= -fi - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -20851,43 +21080,42 @@ done IFS=$as_save_IFS + ;; +esac fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6; } +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi - test -n "$CXX" && break - done fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -20895,23 +21123,20 @@ done IFS=$as_save_IFS + ;; +esac fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6; } +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" else case $cross_compiling:$ac_tool_warned in yes:) @@ -20923,454 +21148,291 @@ configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; esac - CXX=$ac_ct_CXX - fi -fi - + PKG_CONFIG=$ac_pt_PKG_CONFIG fi -fi -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + PKG_CONFIG="" + fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi +GLIB_REQUIRED=2.14.0 +GOBJECT_REQUIRED=2.6.0 +GMODULE_REQUIRED=2.6.0 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi +OGMRIP_MODULES="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GOBJECT_REQUIRED gmodule-2.0 >= $GMODULE_REQUIRED enca" -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for OGMRIP" >&5 +echo $ECHO_N "checking for OGMRIP... $ECHO_C" >&6; } + +if test -n "$OGMRIP_CFLAGS"; then + pkg_cv_OGMRIP_CFLAGS="$OGMRIP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$OGMRIP_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "$OGMRIP_MODULES") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_OGMRIP_CFLAGS=`$PKG_CONFIG --cflags "$OGMRIP_MODULES" 2>/dev/null` +else + pkg_failed=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi + else + pkg_failed=untried +fi +if test -n "$OGMRIP_LIBS"; then + pkg_cv_OGMRIP_LIBS="$OGMRIP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$OGMRIP_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "$OGMRIP_MODULES") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_OGMRIP_LIBS=`$PKG_CONFIG --libs "$OGMRIP_MODULES" 2>/dev/null` else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi + pkg_failed=yes +fi + else + pkg_failed=untried fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CXX" am_compiler_list= -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done +if test $pkg_failed = yes; then - cd .. - rm -rf conftest.dir +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - am_cv_CXX_dependencies_compiler_type=none + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + OGMRIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$OGMRIP_MODULES" 2>&1` + else + OGMRIP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$OGMRIP_MODULES" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$OGMRIP_PKG_ERRORS" >&5 -fi -{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + { { echo "$as_me:$LINENO: error: Package requirements ($OGMRIP_MODULES) were not met: + +$OGMRIP_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables OGMRIP_CFLAGS +and OGMRIP_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements ($OGMRIP_MODULES) were not met: +$OGMRIP_PKG_ERRORS +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' +Alternatively, you may set the environment variables OGMRIP_CFLAGS +and OGMRIP_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables OGMRIP_CFLAGS +and OGMRIP_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables OGMRIP_CFLAGS +and OGMRIP_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= + OGMRIP_CFLAGS=$pkg_cv_OGMRIP_CFLAGS + OGMRIP_LIBS=$pkg_cv_OGMRIP_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : fi -else -if false; then - GCONF_SCHEMAS_INSTALL_TRUE= - GCONF_SCHEMAS_INSTALL_FALSE='#' + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for LIBXML" >&5 +echo $ECHO_N "checking for LIBXML... $ECHO_C" >&6; } + +if test -n "$LIBXML_CFLAGS"; then + pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libxml-2.0\"\"") >&5 + ($PKG_CONFIG --exists --print-errors ""libxml-2.0"") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags ""libxml-2.0"" 2>/dev/null` else - GCONF_SCHEMAS_INSTALL_TRUE='#' - GCONF_SCHEMAS_INSTALL_FALSE= + pkg_failed=yes fi - + else + pkg_failed=untried +fi +if test -n "$LIBXML_LIBS"; then + pkg_cv_LIBXML_LIBS="$LIBXML_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libxml-2.0\"\"") >&5 + ($PKG_CONFIG --exists --print-errors ""libxml-2.0"") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs ""libxml-2.0"" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -if test x"$have_gtk_support" = x"yes"; then - HAVE_GTK_SUPPORT_TRUE= - HAVE_GTK_SUPPORT_FALSE='#' +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - HAVE_GTK_SUPPORT_TRUE='#' - HAVE_GTK_SUPPORT_FALSE= + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors ""libxml-2.0"" 2>&1` + else + LIBXML_PKG_ERRORS=`$PKG_CONFIG --print-errors ""libxml-2.0"" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBXML_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (\"libxml-2.0\") were not met: + +$LIBXML_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. +Alternatively, you may set the environment variables LIBXML_CFLAGS +and LIBXML_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (\"libxml-2.0\") were not met: +$LIBXML_PKG_ERRORS +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. +Alternatively, you may set the environment variables LIBXML_CFLAGS +and LIBXML_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. +Alternatively, you may set the environment variables LIBXML_CFLAGS +and LIBXML_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. -HAL4_REQUIRED=0.4.2 -HAL5_REQUIRED=0.5.0 -DBUS_REQUIRED=0.3.0 +To get pkg-config, see . +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -HAL4_MODULES="hal >= $HAL4_REQUIRED hal < $HAL5_REQUIRED" -HAL5_MODULES="hal >= $HAL5_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED" +Alternatively, you may set the environment variables LIBXML_CFLAGS +and LIBXML_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. -# Check whether --enable-hal-support was given. -if test "${enable_hal_support+set}" = set; then - enableval=$enable_hal_support; have_hal_support="$enableval" +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else - have_hal_support="yes" + LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS + LIBXML_LIBS=$pkg_cv_LIBXML_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : fi -if test x"$have_hal_support" != x"no"; then + pkg_failed=no -{ echo "$as_me:$LINENO: checking for HAL" >&5 -echo $ECHO_N "checking for HAL... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for LIBPNG" >&5 +echo $ECHO_N "checking for LIBPNG... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$HAL_CFLAGS"; then - pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$HAL4_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "$HAL4_MODULES") 2>&5 +if test -n "$LIBPNG_CFLAGS"; then + pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libpng\"\"") >&5 + ($PKG_CONFIG --exists --print-errors ""libpng"") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "$HAL4_MODULES" 2>/dev/null` + pkg_cv_LIBPNG_CFLAGS=`$PKG_CONFIG --cflags ""libpng"" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$HAL_LIBS"; then - pkg_cv_HAL_LIBS="$HAL_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$HAL4_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "$HAL4_MODULES") 2>&5 +if test -n "$LIBPNG_LIBS"; then + pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libpng\"\"") >&5 + ($PKG_CONFIG --exists --print-errors ""libpng"") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "$HAL4_MODULES" 2>/dev/null` + pkg_cv_LIBPNG_LIBS=`$PKG_CONFIG --libs ""libpng"" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -21383,74 +21445,288 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$HAL4_MODULES"` + LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors ""libpng"" 2>&1` else - HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$HAL4_MODULES"` + LIBPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors ""libpng"" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$HAL_PKG_ERRORS" >&5 + echo "$LIBPNG_PKG_ERRORS" >&5 { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - have_hal_support=no + have_png_support=no elif test $pkg_failed = untried; then - have_hal_support=no + have_png_support=no else - HAL_CFLAGS=$pkg_cv_HAL_CFLAGS - HAL_LIBS=$pkg_cv_HAL_LIBS + LIBPNG_CFLAGS=$pkg_cv_LIBPNG_CFLAGS + LIBPNG_LIBS=$pkg_cv_LIBPNG_LIBS { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - have_hal_support=yes + have_png_support=yes +fi + + + +if test x"$have_png_support" = x"yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_PNG_SUPPORT 1 +_ACEOF + +fi + + + +if test x"$have_png_support" = x"yes"; then + HAVE_PNG_SUPPORT_TRUE= + HAVE_PNG_SUPPORT_FALSE='#' +else + HAVE_PNG_SUPPORT_TRUE='#' + HAVE_PNG_SUPPORT_FALSE= +fi + + +{ echo "$as_me:$LINENO: checking for TIFFOpen in -ltiff" >&5 +echo $ECHO_N "checking for TIFFOpen in -ltiff... $ECHO_C" >&6; } +if test "${ac_cv_lib_tiff_TIFFOpen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltiff $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char TIFFOpen (); +int +main () +{ +return TIFFOpen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_tiff_TIFFOpen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_tiff_TIFFOpen=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFOpen" >&5 +echo "${ECHO_T}$ac_cv_lib_tiff_TIFFOpen" >&6; } +if test $ac_cv_lib_tiff_TIFFOpen = yes; then + LIBTIFF_LIBS="-ltiff" && have_tiff_support=yes +else + have_tiff_support=no fi -if test x"$have_hal_support" = x"yes"; then + + +if test x"$have_tiff_support" = x"yes"; then cat >>confdefs.h <<\_ACEOF -#define USE_HAL4 1 +#define HAVE_TIFF_SUPPORT 1 _ACEOF +fi + + + +if test x"$have_tiff_support" = x"yes"; then + HAVE_TIFF_SUPPORT_TRUE= + HAVE_TIFF_SUPPORT_FALSE='#' +else + HAVE_TIFF_SUPPORT_TRUE='#' + HAVE_TIFF_SUPPORT_FALSE= +fi + + +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } +fi + + + +# Extract the first word of "gsed", so it can be a program name with args. +set dummy gsed; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_SED_PROG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $SED_PROG in + [\\/]* | ?:[\\/]*) + ac_cv_path_SED_PROG="$SED_PROG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_SED_PROG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +SED_PROG=$ac_cv_path_SED_PROG +if test -n "$SED_PROG"; then + { echo "$as_me:$LINENO: result: $SED_PROG" >&5 +echo "${ECHO_T}$SED_PROG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +if test x"$SED_PROG" = x; then + # Extract the first word of "sed", so it can be a program name with args. +set dummy sed; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_SED_PROG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $SED_PROG in + [\\/]* | ?:[\\/]*) + ac_cv_path_SED_PROG="$SED_PROG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_SED_PROG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +SED_PROG=$ac_cv_path_SED_PROG +if test -n "$SED_PROG"; then + { echo "$as_me:$LINENO: result: $SED_PROG" >&5 +echo "${ECHO_T}$SED_PROG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if ! "$SED_PROG" --version 2> /dev/null | head -n 1 | grep -q "GNU sed"; then + { { echo "$as_me:$LINENO: error: Unable to find GNU sed in the PATH. You need GNU sed to configure OGMRip. Find it on ftp://ftp.gnu.org/gnu/sed" >&5 +echo "$as_me: error: Unable to find GNU sed in the PATH. You need GNU sed to configure OGMRip. Find it on ftp://ftp.gnu.org/gnu/sed" >&2;} + { (exit 1); exit 1; }; } +fi + + +GTK_REQUIRED=2.6.0 +LIBGLADE_REQUIRED=2.5.0 +GCONF_REQUIRED=2.6.0 + +GUI_MODULES="gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" + +# Check whether --enable-gtk-support was given. +if test "${enable_gtk_support+set}" = set; then + enableval=$enable_gtk_support; have_gtk_support="$enableval" else + have_gtk_support="yes" +fi + + +if test x"$have_gtk_support" != x"no"; then pkg_failed=no -{ echo "$as_me:$LINENO: checking for HAL" >&5 -echo $ECHO_N "checking for HAL... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for GUI" >&5 +echo $ECHO_N "checking for GUI... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$HAL_CFLAGS"; then - pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$HAL5_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "$HAL5_MODULES") 2>&5 +if test -n "$GUI_CFLAGS"; then + pkg_cv_GUI_CFLAGS="$GUI_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GUI_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "$GUI_MODULES") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "$HAL5_MODULES" 2>/dev/null` + pkg_cv_GUI_CFLAGS=`$PKG_CONFIG --cflags "$GUI_MODULES" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$HAL_LIBS"; then - pkg_cv_HAL_LIBS="$HAL_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$HAL5_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "$HAL5_MODULES") 2>&5 + else + pkg_failed=untried +fi +if test -n "$GUI_LIBS"; then + pkg_cv_GUI_LIBS="$GUI_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GUI_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "$GUI_MODULES") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "$HAL5_MODULES" 2>/dev/null` + pkg_cv_GUI_LIBS=`$PKG_CONFIG --libs "$GUI_MODULES" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -21463,139 +21739,148 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$HAL5_MODULES"` + GUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GUI_MODULES" 2>&1` else - HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$HAL5_MODULES"` + GUI_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GUI_MODULES" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$HAL_PKG_ERRORS" >&5 + echo "$GUI_PKG_ERRORS" >&5 { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - have_hal_support=no + have_gtk_support=no elif test $pkg_failed = untried; then - have_hal_support=no + have_gtk_support=no else - HAL_CFLAGS=$pkg_cv_HAL_CFLAGS - HAL_LIBS=$pkg_cv_HAL_LIBS + GUI_CFLAGS=$pkg_cv_GUI_CFLAGS + GUI_LIBS=$pkg_cv_GUI_LIBS { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - have_hal_support=yes + have_gtk_support=yes fi - if test x"$have_hal_support" = x"yes"; then +fi + +if test x"$have_gtk_support" = x"yes"; then cat >>confdefs.h <<\_ACEOF -#define USE_HAL5 1 +#define HAVE_GTK_SUPPORT 1 _ACEOF + # Extract the first word of "gconftool-2", so it can be a program name with args. +set dummy gconftool-2; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_GCONFTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $GCONFTOOL in + [\\/]* | ?:[\\/]*) + ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi -fi +done +done +IFS=$as_save_IFS + ;; +esac +fi +GCONFTOOL=$ac_cv_path_GCONFTOOL +if test -n "$GCONFTOOL"; then + { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5 +echo "${ECHO_T}$GCONFTOOL" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then + GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` + else + GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE + fi -ENCHANT_REQUIRED=1.1.0 -ENCHANT_MODULES="enchant >= $ENCHANT_REQUIRED" -# Check whether --enable-enchant-support was given. -if test "${enable_enchant_support+set}" = set; then - enableval=$enable_enchant_support; have_enchant_support="$enableval" -else - have_enchant_support="yes" +# Check whether --with-gconf-source was given. +if test "${with_gconf_source+set}" = set; then + withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval" fi -if test x"$have_enchant_support" != x"no"; then -pkg_failed=no -{ echo "$as_me:$LINENO: checking for ENCHANT" >&5 -echo $ECHO_N "checking for ENCHANT... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 +echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$ENCHANT_CFLAGS"; then - pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$ENCHANT_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "$ENCHANT_MODULES") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "$ENCHANT_MODULES" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$ENCHANT_LIBS"; then - pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$ENCHANT_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "$ENCHANT_MODULES") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "$ENCHANT_MODULES" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried + if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' + fi + + +# Check whether --with-gconf-schema-file-dir was given. +if test "${with_gconf_schema_file_dir+set}" = set; then + withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval" fi -if test $pkg_failed = yes; then + { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 +echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no + # Check whether --enable-schemas-install was given. +if test "${enable_schemas_install+set}" = set; then + enableval=$enable_schemas_install; case ${enableval} in + yes|no) ;; + *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5 +echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;} + { (exit 1); exit 1; }; } ;; + esac fi - if test $_pkg_short_errors_supported = yes; then - ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$ENCHANT_MODULES"` - else - ENCHANT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$ENCHANT_MODULES"` - fi - # Put the nasty error message in config.log where it belongs - echo "$ENCHANT_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - have_enchant_support=no -elif test $pkg_failed = untried; then - have_enchant_support=no + + +if test "$enable_schemas_install" != no; then + GCONF_SCHEMAS_INSTALL_TRUE= + GCONF_SCHEMAS_INSTALL_FALSE='#' else - ENCHANT_CFLAGS=$pkg_cv_ENCHANT_CFLAGS - ENCHANT_LIBS=$pkg_cv_ENCHANT_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - have_enchant_support=yes -fi + GCONF_SCHEMAS_INSTALL_TRUE='#' + GCONF_SCHEMAS_INSTALL_FALSE= fi -if test x"$have_enchant_support" = x"yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_ENCHANT_SUPPORT 1 -_ACEOF +else + +if false; then + GCONF_SCHEMAS_INSTALL_TRUE= + GCONF_SCHEMAS_INSTALL_FALSE='#' +else + GCONF_SCHEMAS_INSTALL_TRUE='#' + GCONF_SCHEMAS_INSTALL_FALSE= fi +fi -if test x"$have_enchant_support" != x"no"; then - HAVE_ENCHANT_SUPPORT_TRUE= - HAVE_ENCHANT_SUPPORT_FALSE='#' + +if test x"$have_gtk_support" = x"yes"; then + HAVE_GTK_SUPPORT_TRUE= + HAVE_GTK_SUPPORT_FALSE='#' else - HAVE_ENCHANT_SUPPORT_TRUE='#' - HAVE_ENCHANT_SUPPORT_FALSE= + HAVE_GTK_SUPPORT_TRUE='#' + HAVE_GTK_SUPPORT_FALSE= fi @@ -21603,350 +21888,274 @@ +HAL4_REQUIRED=0.4.2 +HAL5_REQUIRED=0.5.0 +DBUS_REQUIRED=0.3.0 -{ echo "$as_me:$LINENO: checking for cam_open_spec_device in -lcam" >&5 -echo $ECHO_N "checking for cam_open_spec_device in -lcam... $ECHO_C" >&6; } -if test "${ac_cv_lib_cam_cam_open_spec_device+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +HAL4_MODULES="hal >= $HAL4_REQUIRED hal < $HAL5_REQUIRED" +HAL5_MODULES="hal >= $HAL5_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED" + +# Check whether --enable-hal-support was given. +if test "${enable_hal_support+set}" = set; then + enableval=$enable_hal_support; have_hal_support="$enableval" else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcam $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + have_hal_support="yes" +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cam_open_spec_device (); -int -main () -{ -return cam_open_spec_device (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + +if test x"$have_hal_support" != x"no"; then + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for HAL" >&5 +echo $ECHO_N "checking for HAL... $ECHO_C" >&6; } + +if test -n "$HAL_CFLAGS"; then + pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$HAL4_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "$HAL4_MODULES") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_cam_cam_open_spec_device=yes + (exit $ac_status); }; then + pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "$HAL4_MODULES" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$HAL_LIBS"; then + pkg_cv_HAL_LIBS="$HAL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$HAL4_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "$HAL4_MODULES") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "$HAL4_MODULES" 2>/dev/null` else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_cam_cam_open_spec_device=no + pkg_failed=yes fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + else + pkg_failed=untried fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_cam_cam_open_spec_device" >&5 -echo "${ECHO_T}$ac_cv_lib_cam_cam_open_spec_device" >&6; } -if test $ac_cv_lib_cam_cam_open_spec_device = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCAM 1 -_ACEOF - LIBS="-lcam $LIBS" -fi +if test $pkg_failed = yes; then +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$HAL4_MODULES" 2>&1` + else + HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "$HAL4_MODULES" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$HAL_PKG_ERRORS" >&5 -{ echo "$as_me:$LINENO: checking for DVDOpen in -ldvdread" >&5 -echo $ECHO_N "checking for DVDOpen in -ldvdread... $ECHO_C" >&6; } -if test "${ac_cv_lib_dvdread_DVDOpen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + have_hal_support=no +elif test $pkg_failed = untried; then + have_hal_support=no else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldvdread $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + HAL_CFLAGS=$pkg_cv_HAL_CFLAGS + HAL_LIBS=$pkg_cv_HAL_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + have_hal_support=yes +fi + if test x"$have_hal_support" = x"yes"; then -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char DVDOpen (); -int -main () -{ -return DVDOpen (); - ; - return 0; -} +cat >>confdefs.h <<\_ACEOF +#define USE_HAL4 1 _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + + else + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for HAL" >&5 +echo $ECHO_N "checking for HAL... $ECHO_C" >&6; } + +if test -n "$HAL_CFLAGS"; then + pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$HAL5_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "$HAL5_MODULES") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dvdread_DVDOpen=yes + (exit $ac_status); }; then + pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "$HAL5_MODULES" 2>/dev/null` else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dvdread_DVDOpen=no + pkg_failed=yes fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + else + pkg_failed=untried fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dvdread_DVDOpen" >&5 -echo "${ECHO_T}$ac_cv_lib_dvdread_DVDOpen" >&6; } -if test $ac_cv_lib_dvdread_DVDOpen = yes; then - DVDREAD_LIBS="-ldvdread" +if test -n "$HAL_LIBS"; then + pkg_cv_HAL_LIBS="$HAL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$HAL5_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "$HAL5_MODULES") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "$HAL5_MODULES" 2>/dev/null` else - { { echo "$as_me:$LINENO: error: Unable to find libdvdread. You need libdvdread to use OGMRip. Find it on http://www.dtek.chalmers.se/groups/dvd" >&5 -echo "$as_me: error: Unable to find libdvdread. You need libdvdread to use OGMRip. Find it on http://www.dtek.chalmers.se/groups/dvd" >&2;} - { (exit 1); exit 1; }; } + pkg_failed=yes +fi + else + pkg_failed=untried fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test $pkg_failed = yes; then -if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$HAL5_MODULES" 2>&1` + else + HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "$HAL5_MODULES" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$HAL_PKG_ERRORS" >&5 -#include -#include -#include -#include -#include -int main(void) { if (DVDREAD_VERSION < 907) return 1; return 0; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + have_hal_support=no +elif test $pkg_failed = untried; then + have_hal_support=no +else + HAL_CFLAGS=$pkg_cv_HAL_CFLAGS + HAL_LIBS=$pkg_cv_HAL_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + have_hal_support=yes +fi + if test x"$have_hal_support" = x"yes"; then +cat >>confdefs.h <<\_ACEOF +#define USE_HAL5 1 _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: Unable to find libdvdread >= 0.9.7" >&5 -echo "$as_me: error: Unable to find libdvdread >= 0.9.7" >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi fi -# Extract the first word of "eject", so it can be a program name with args. -set dummy eject; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_EJECT_PROG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +ENCHANT_REQUIRED=1.1.0 +ENCHANT_MODULES="enchant >= $ENCHANT_REQUIRED" + +# Check whether --enable-enchant-support was given. +if test "${enable_enchant_support+set}" = set; then + enableval=$enable_enchant_support; have_enchant_support="$enableval" else - case $EJECT_PROG in - [\\/]* | ?:[\\/]*) - ac_cv_path_EJECT_PROG="$EJECT_PROG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_EJECT_PROG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + have_enchant_support="yes" +fi - ;; -esac + +if test x"$have_enchant_support" != x"no"; then + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for ENCHANT" >&5 +echo $ECHO_N "checking for ENCHANT... $ECHO_C" >&6; } + +if test -n "$ENCHANT_CFLAGS"; then + pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$ENCHANT_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "$ENCHANT_MODULES") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "$ENCHANT_MODULES" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -EJECT_PROG=$ac_cv_path_EJECT_PROG -if test -n "$EJECT_PROG"; then - { echo "$as_me:$LINENO: result: $EJECT_PROG" >&5 -echo "${ECHO_T}$EJECT_PROG" >&6; } +if test -n "$ENCHANT_LIBS"; then + pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$ENCHANT_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "$ENCHANT_MODULES") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "$ENCHANT_MODULES" 2>/dev/null` else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + pkg_failed=yes +fi + else + pkg_failed=untried fi -if test x"$EJECT_PROG" = x; then - { { echo "$as_me:$LINENO: error: Unable to find eject in the PATH. You need eject to use OGMRip. Find it on http://eject.sourceforge.net/" >&5 -echo "$as_me: error: Unable to find eject in the PATH. You need eject to use OGMRip. Find it on http://eject.sourceforge.net/" >&2;} - { (exit 1); exit 1; }; } -fi +if test $pkg_failed = yes; then -# Extract the first word of "mplayer", so it can be a program name with args. -set dummy mplayer; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_MPLAYER_PROG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - case $MPLAYER_PROG in - [\\/]* | ?:[\\/]*) - ac_cv_path_MPLAYER_PROG="$MPLAYER_PROG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_MPLAYER_PROG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac + _pkg_short_errors_supported=no fi -MPLAYER_PROG=$ac_cv_path_MPLAYER_PROG -if test -n "$MPLAYER_PROG"; then - { echo "$as_me:$LINENO: result: $MPLAYER_PROG" >&5 -echo "${ECHO_T}$MPLAYER_PROG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 + if test $_pkg_short_errors_supported = yes; then + ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$ENCHANT_MODULES" 2>&1` + else + ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$ENCHANT_MODULES" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ENCHANT_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } + have_enchant_support=no +elif test $pkg_failed = untried; then + have_enchant_support=no +else + ENCHANT_CFLAGS=$pkg_cv_ENCHANT_CFLAGS + ENCHANT_LIBS=$pkg_cv_ENCHANT_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + have_enchant_support=yes fi - - -if test x"$MPLAYER_PROG" = x; then - { { echo "$as_me:$LINENO: error: Unable to find mplayer in the PATH. You need mplayer to use OGMRip. Find it on http://www.mplayerhq.hu" >&5 -echo "$as_me: error: Unable to find mplayer in the PATH. You need mplayer to use OGMRip. Find it on http://www.mplayerhq.hu" >&2;} - { (exit 1); exit 1; }; } fi -MPLAYER_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer"` - - -# Check whether --with-mplayer-version was given. -if test "${with_mplayer_version+set}" = set; then - withval=$with_mplayer_version; -fi +if test x"$have_enchant_support" = x"yes"; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_ENCHANT_SUPPORT 1 +_ACEOF -if test x"$with_mplayer_version" != x; then - MPLAYER_VERSION="MPlayer $with_mplayer_version" fi -if echo $MPLAYER_VERSION | grep -q "MPlayer [0-1]\.[0-9]\+\(\(rc\|pre\)[0-9]\+\)\?"; then - have_mplayer_dev=no - MPLAYER_MAJOR_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer \([0-1]\).*%\1%'` - MPLAYER_MINOR_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [0-1]\.\([0-9]\).*%\1%'` - MPLAYER_PRE_VERSION=0 - MPLAYER_RC_VERSION=0 - if echo $MPLAYER_VERSION | grep -q "^MPlayer [0-1]\.[0-9]\+pre[0-9]\+.*"; then - MPLAYER_PRE_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [0-1]\.[0-9]\+pre\([0-9]\+\).*%\1%'` - fi - if echo $MPLAYER_VERSION | grep -q "^MPlayer [0-1]\.[0-9]\+rc[0-9]\+.*"; then - MPLAYER_RC_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [0-1]\.[0-9]\+rc\([0-9]\+\).*%\1%'` - fi +if test x"$have_enchant_support" != x"no"; then + HAVE_ENCHANT_SUPPORT_TRUE= + HAVE_ENCHANT_SUPPORT_FALSE='#' else - if echo $MPLAYER_VERSION | grep -q "dev-\(CVS\|SVN\)" || \ - echo $MPLAYER_VERSION | grep -q "SVN-"; then - have_mplayer_dev=yes - MPLAYER_MAJOR_VERSION=99 - MPLAYER_MINOR_VERSION=99 - MPLAYER_PRE_VERSION=99 - MPLAYER_RC_VERSION=99 - { echo "$as_me:$LINENO: WARNING: Mplayer SVN/CVS detected - USE AT YOUR OWN RISK" >&5 -echo "$as_me: WARNING: Mplayer SVN/CVS detected - USE AT YOUR OWN RISK" >&2;} - else - { { echo "$as_me:$LINENO: error: Unable to determine the version number of mplayer or the version number you specified with --with-mplayer-version is invalid." >&5 -echo "$as_me: error: Unable to determine the version number of mplayer or the version number you specified with --with-mplayer-version is invalid." >&2;} - { (exit 1); exit 1; }; } - fi + HAVE_ENCHANT_SUPPORT_TRUE='#' + HAVE_ENCHANT_SUPPORT_FALSE= fi @@ -21955,204 +22164,224 @@ -# Extract the first word of "mencoder", so it can be a program name with args. -set dummy mencoder; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_MENCODER_PROG+set}" = set; then +{ echo "$as_me:$LINENO: checking for cam_open_spec_device in -lcam" >&5 +echo $ECHO_N "checking for cam_open_spec_device in -lcam... $ECHO_C" >&6; } +if test "${ac_cv_lib_cam_cam_open_spec_device+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $MENCODER_PROG in - [\\/]* | ?:[\\/]*) - ac_cv_path_MENCODER_PROG="$MENCODER_PROG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_MENCODER_PROG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcam $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - ;; +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cam_open_spec_device (); +int +main () +{ +return cam_open_spec_device (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -MENCODER_PROG=$ac_cv_path_MENCODER_PROG -if test -n "$MENCODER_PROG"; then - { echo "$as_me:$LINENO: result: $MENCODER_PROG" >&5 -echo "${ECHO_T}$MENCODER_PROG" >&6; } +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_cam_cam_open_spec_device=yes else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_cam_cam_open_spec_device=no fi +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_cam_cam_open_spec_device" >&5 +echo "${ECHO_T}$ac_cv_lib_cam_cam_open_spec_device" >&6; } +if test $ac_cv_lib_cam_cam_open_spec_device = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBCAM 1 +_ACEOF + + LIBS="-lcam $LIBS" -if test x"$MENCODER_PROG" = x; then - { { echo "$as_me:$LINENO: error: Unable to find mencoder in the PATH. You need mencoder to use OGMRip. Find it on http://www.mplayerhq.hu" >&5 -echo "$as_me: error: Unable to find mencoder in the PATH. You need mencoder to use OGMRip. Find it on http://www.mplayerhq.hu" >&2;} - { (exit 1); exit 1; }; } fi -# Extract the first word of "ogmmerge", so it can be a program name with args. -set dummy ogmmerge; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_OGMMERGE_PROG+set}" = set; then + +{ echo "$as_me:$LINENO: checking for DVDOpen in -ldvdread" >&5 +echo $ECHO_N "checking for DVDOpen in -ldvdread... $ECHO_C" >&6; } +if test "${ac_cv_lib_dvdread_DVDOpen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $OGMMERGE_PROG in - [\\/]* | ?:[\\/]*) - ac_cv_path_OGMMERGE_PROG="$OGMMERGE_PROG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_OGMMERGE_PROG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldvdread $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - ;; +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char DVDOpen (); +int +main () +{ +return DVDOpen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -OGMMERGE_PROG=$ac_cv_path_OGMMERGE_PROG -if test -n "$OGMMERGE_PROG"; then - { echo "$as_me:$LINENO: result: $OGMMERGE_PROG" >&5 -echo "${ECHO_T}$OGMMERGE_PROG" >&6; } +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_dvdread_DVDOpen=yes else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -if test x"$OGMMERGE_PROG" = x; then - { { echo "$as_me:$LINENO: error: Unable to find ogmmerge in the PATH. You need ogmmerge to use OGMRip. Find it on http://www.bunkus.org/videotools/ogmtools" >&5 -echo "$as_me: error: Unable to find ogmmerge in the PATH. You need ogmmerge to use OGMRip. Find it on http://www.bunkus.org/videotools/ogmtools" >&2;} - { (exit 1); exit 1; }; } + ac_cv_lib_dvdread_DVDOpen=no fi - -# Extract the first word of "ogmsplit", so it can be a program name with args. -set dummy ogmsplit; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_OGMSPLIT_PROG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $OGMSPLIT_PROG in - [\\/]* | ?:[\\/]*) - ac_cv_path_OGMSPLIT_PROG="$OGMSPLIT_PROG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_OGMSPLIT_PROG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -OGMSPLIT_PROG=$ac_cv_path_OGMSPLIT_PROG -if test -n "$OGMSPLIT_PROG"; then - { echo "$as_me:$LINENO: result: $OGMSPLIT_PROG" >&5 -echo "${ECHO_T}$OGMSPLIT_PROG" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dvdread_DVDOpen" >&5 +echo "${ECHO_T}$ac_cv_lib_dvdread_DVDOpen" >&6; } +if test $ac_cv_lib_dvdread_DVDOpen = yes; then + DVDREAD_LIBS="-ldvdread" else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { { echo "$as_me:$LINENO: error: Unable to find libdvdread. You need libdvdread to use OGMRip. Find it on http://www.dtek.chalmers.se/groups/dvd" >&5 +echo "$as_me: error: Unable to find libdvdread. You need libdvdread to use OGMRip. Find it on http://www.dtek.chalmers.se/groups/dvd" >&2;} + { (exit 1); exit 1; }; } fi -if test x"$OGMSPLIT_PROG" = x; then - { { echo "$as_me:$LINENO: error: Unable to find ogmsplit in the PATH. You need ogmsplit to use OGMRip. Find it on http://www.bunkus.org/videotools/ogmtools" >&5 -echo "$as_me: error: Unable to find ogmsplit in the PATH. You need ogmsplit to use OGMRip. Find it on http://www.bunkus.org/videotools/ogmtools" >&2;} - { (exit 1); exit 1; }; } -fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Extract the first word of "oggenc", so it can be a program name with args. -set dummy oggenc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_OGGENC_PROG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else - case $OGGENC_PROG in - [\\/]* | ?:[\\/]*) - ac_cv_path_OGGENC_PROG="$OGGENC_PROG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_OGGENC_PROG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - ;; +#include +#include +#include +#include +#include +int main(void) { if (DVDREAD_VERSION < 907) return 1; return 0; } + +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -OGGENC_PROG=$ac_cv_path_OGGENC_PROG -if test -n "$OGGENC_PROG"; then - { echo "$as_me:$LINENO: result: $OGGENC_PROG" >&5 -echo "${ECHO_T}$OGGENC_PROG" >&6; } +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -if test x"$OGGENC_PROG" = x; then - { { echo "$as_me:$LINENO: error: Unable to find oggenc in the PATH. You need oggenc to use OGMRip. Find it on http://www.xiph.org/ogg/vorbis" >&5 -echo "$as_me: error: Unable to find oggenc in the PATH. You need oggenc to use OGMRip. Find it on http://www.xiph.org/ogg/vorbis" >&2;} +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: Unable to find libdvdread >= 0.9.7" >&5 +echo "$as_me: error: Unable to find libdvdread >= 0.9.7" >&2;} { (exit 1); exit 1; }; } fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + -# Extract the first word of "lame", so it can be a program name with args. -set dummy lame; ac_word=$2 + +# Extract the first word of "eject", so it can be a program name with args. +set dummy eject; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_LAME_PROG+set}" = set; then +if test "${ac_cv_path_EJECT_PROG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $LAME_PROG in + case $EJECT_PROG in [\\/]* | ?:[\\/]*) - ac_cv_path_LAME_PROG="$LAME_PROG" # Let the user override the test with a path. + ac_cv_path_EJECT_PROG="$EJECT_PROG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -22162,7 +22391,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_LAME_PROG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_EJECT_PROG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -22173,166 +22402,33 @@ ;; esac fi -LAME_PROG=$ac_cv_path_LAME_PROG -if test -n "$LAME_PROG"; then - { echo "$as_me:$LINENO: result: $LAME_PROG" >&5 -echo "${ECHO_T}$LAME_PROG" >&6; } +EJECT_PROG=$ac_cv_path_EJECT_PROG +if test -n "$EJECT_PROG"; then + { echo "$as_me:$LINENO: result: $EJECT_PROG" >&5 +echo "${ECHO_T}$EJECT_PROG" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi -if test x"$LAME_PROG" = x; then - { { echo "$as_me:$LINENO: error: Unable to find lame in the PATH. You need lame to use OGMRip. Find it on http://lame.sourceforge.net" >&5 -echo "$as_me: error: Unable to find lame in the PATH. You need lame to use OGMRip. Find it on http://lame.sourceforge.net" >&2;} - { (exit 1); exit 1; }; } -fi - - -{ echo "$as_me:$LINENO: checking for XviD support" >&5 -echo $ECHO_N "checking for XviD support... $ECHO_C" >&6; } -if $MENCODER_PROG -ovc help 2> /dev/null | grep -q "^ *xvid *- .*$"; then - result=yes -else - result=no -fi -{ echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - -if test x"$result" = x"no"; then - { { echo "$as_me:$LINENO: error: MPlayer is not build with XviD support. OGMRip requires XviD support in mplayer" >&5 -echo "$as_me: error: MPlayer is not build with XviD support. OGMRip requires XviD support in mplayer" >&2;} - { (exit 1); exit 1; }; } -fi - - -{ echo "$as_me:$LINENO: checking for Lavc support" >&5 -echo $ECHO_N "checking for Lavc support... $ECHO_C" >&6; } -if $MENCODER_PROG -ovc help 2> /dev/null | grep -q "^ *lavc *- .*$"; then - result=yes -else - result=no -fi -{ echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - -if test x"$result" = x"no"; then - { { echo "$as_me:$LINENO: error: MPlayer is not build with Lavc support. OGMRip requires Lavc support in mplayer" >&5 -echo "$as_me: error: MPlayer is not build with Lavc support. OGMRip requires Lavc support in mplayer" >&2;} +if test x"$EJECT_PROG" = x; then + { { echo "$as_me:$LINENO: error: Unable to find eject in the PATH. You need eject to use OGMRip. Find it on http://eject.sourceforge.net/" >&5 +echo "$as_me: error: Unable to find eject in the PATH. You need eject to use OGMRip. Find it on http://eject.sourceforge.net/" >&2;} { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: checking for x264 support" >&5 -echo $ECHO_N "checking for x264 support... $ECHO_C" >&6; } -if $MENCODER_PROG -ovc help 2> /dev/null | grep -q "^ *x264 *- .*$"; then - have_x264_support=yes -else - have_x264_support=no -fi -{ echo "$as_me:$LINENO: result: $have_x264_support" >&5 -echo "${ECHO_T}$have_x264_support" >&6; } - -if test x"$have_x264_support" = x"yes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_X264_SUPPORT 1 -_ACEOF - -fi - - - -if test x"$have_x264_support" = x"yes"; then - HAVE_X264_SUPPORT_TRUE= - HAVE_X264_SUPPORT_FALSE='#' -else - HAVE_X264_SUPPORT_TRUE='#' - HAVE_X264_SUPPORT_FALSE= -fi - - - -{ echo "$as_me:$LINENO: checking for Lavf support" >&5 -echo $ECHO_N "checking for Lavf support... $ECHO_C" >&6; } -if $MENCODER_PROG -of help 2> /dev/null | grep -q "^ *lavf *- .*$"; then - have_lavf_support=yes -else - have_lavf_support=no -fi -{ echo "$as_me:$LINENO: result: $have_lavf_support" >&5 -echo "${ECHO_T}$have_lavf_support" >&6; } - -if test x"$have_lavf_support" = x"yes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LAVF_SUPPORT 1 -_ACEOF - -fi - - - -if test x"$have_lavf_support" = x"yes"; then - HAVE_LAVF_SUPPORT_TRUE= - HAVE_LAVF_SUPPORT_FALSE='#' -else - HAVE_LAVF_SUPPORT_TRUE='#' - HAVE_LAVF_SUPPORT_FALSE= -fi - - - -{ echo "$as_me:$LINENO: checking for DTS support" >&5 -echo $ECHO_N "checking for DTS support... $ECHO_C" >&6; } -if $MPLAYER_PROG -ac help 2> /dev/null | grep -q "^\(ffdts\|ffdca\|dts\).*working.*$"; then - have_dts_support=yes -else - have_dts_support=no -fi -{ echo "$as_me:$LINENO: result: $have_dts_support" >&5 -echo "${ECHO_T}$have_dts_support" >&6; } - -if test x"$have_dts_support" = x"yes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DTS_SUPPORT 1 -_ACEOF - -fi - - - -if test x"$have_dts_support" = x"yes"; then - HAVE_DTS_SUPPORT_TRUE= - HAVE_DTS_SUPPORT_FALSE='#' -else - HAVE_DTS_SUPPORT_TRUE='#' - HAVE_DTS_SUPPORT_FALSE= -fi - - - -# Check whether --enable-aac-support was given. -if test "${enable_aac_support+set}" = set; then - enableval=$enable_aac_support; have_aac_support="$enableval" -else - have_aac_support="yes" -fi - - -if test x"$have_aac_support" != x"no"; then - # Extract the first word of "faac", so it can be a program name with args. -set dummy faac; ac_word=$2 +# Extract the first word of "mplayer", so it can be a program name with args. +set dummy mplayer; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_FAAC_PROG+set}" = set; then +if test "${ac_cv_path_MPLAYER_PROG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $FAAC_PROG in + case $MPLAYER_PROG in [\\/]* | ?:[\\/]*) - ac_cv_path_FAAC_PROG="$FAAC_PROG" # Let the user override the test with a path. + ac_cv_path_MPLAYER_PROG="$MPLAYER_PROG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -22342,7 +22438,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_FAAC_PROG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_MPLAYER_PROG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -22353,62 +22449,33 @@ ;; esac fi -FAAC_PROG=$ac_cv_path_FAAC_PROG -if test -n "$FAAC_PROG"; then - { echo "$as_me:$LINENO: result: $FAAC_PROG" >&5 -echo "${ECHO_T}$FAAC_PROG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - if test x"$FAAC_PROG" != x; then - have_aac_support=yes - else - have_aac_support=no - fi -fi - -if test x"$have_aac_support" = x"yes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_AAC_SUPPORT 1 -_ACEOF - -fi - - - -if test x"$have_aac_support" = x"yes"; then - HAVE_AAC_SUPPORT_TRUE= - HAVE_AAC_SUPPORT_FALSE='#' +MPLAYER_PROG=$ac_cv_path_MPLAYER_PROG +if test -n "$MPLAYER_PROG"; then + { echo "$as_me:$LINENO: result: $MPLAYER_PROG" >&5 +echo "${ECHO_T}$MPLAYER_PROG" >&6; } else - HAVE_AAC_SUPPORT_TRUE='#' - HAVE_AAC_SUPPORT_FALSE= + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - -# Check whether --enable-matroska-support was given. -if test "${enable_matroska_support+set}" = set; then - enableval=$enable_matroska_support; have_mkv_support="$enableval" -else - have_mkv_support="yes" +if test x"$MPLAYER_PROG" = x; then + { { echo "$as_me:$LINENO: error: Unable to find mplayer in the PATH. You need mplayer to use OGMRip. Find it on http://www.mplayerhq.hu" >&5 +echo "$as_me: error: Unable to find mplayer in the PATH. You need mplayer to use OGMRip. Find it on http://www.mplayerhq.hu" >&2;} + { (exit 1); exit 1; }; } fi -if test x"$have_mkv_support" != x"no"; then - # Extract the first word of "mkvmerge", so it can be a program name with args. -set dummy mkvmerge; ac_word=$2 +# Extract the first word of "mencoder", so it can be a program name with args. +set dummy mencoder; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_MKVMERGE_PROG+set}" = set; then +if test "${ac_cv_path_MENCODER_PROG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $MKVMERGE_PROG in + case $MENCODER_PROG in [\\/]* | ?:[\\/]*) - ac_cv_path_MKVMERGE_PROG="$MKVMERGE_PROG" # Let the user override the test with a path. + ac_cv_path_MENCODER_PROG="$MENCODER_PROG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -22418,7 +22485,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_MKVMERGE_PROG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_MENCODER_PROG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -22429,39 +22496,53 @@ ;; esac fi -MKVMERGE_PROG=$ac_cv_path_MKVMERGE_PROG -if test -n "$MKVMERGE_PROG"; then - { echo "$as_me:$LINENO: result: $MKVMERGE_PROG" >&5 -echo "${ECHO_T}$MKVMERGE_PROG" >&6; } +MENCODER_PROG=$ac_cv_path_MENCODER_PROG +if test -n "$MENCODER_PROG"; then + { echo "$as_me:$LINENO: result: $MENCODER_PROG" >&5 +echo "${ECHO_T}$MENCODER_PROG" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi - if test x"$MKVMERGE_PROG" != x; then - have_mkv_support=yes - else - have_mkv_support=no - fi +if test x"$MENCODER_PROG" = x; then + { { echo "$as_me:$LINENO: error: Unable to find mencoder in the PATH. You need mencoder to use OGMRip. Find it on http://www.mplayerhq.hu" >&5 +echo "$as_me: error: Unable to find mencoder in the PATH. You need mencoder to use OGMRip. Find it on http://www.mplayerhq.hu" >&2;} + { (exit 1); exit 1; }; } fi -if test x"$have_mkv_support" = x"yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_MKV_SUPPORT 1 -_ACEOF +# Check whether --enable-ogm-support was given. +if test "${enable_ogm_support+set}" = set; then + enableval=$enable_ogm_support; have_ogm_support="$enableval" +else + have_ogm_support="yes" +fi - MKVMERGE_MAJOR_VERSION=`$MKVMERGE_PROG --version 2> /dev/null | $SED_PROG -e 's%^mkvmerge v\([0-9]\).*%\1%'` -cat >>confdefs.h <<_ACEOF -#define MKVMERGE_MAJOR_VERSION $MKVMERGE_MAJOR_VERSION -_ACEOF + +if test x"$have_ogm_support" = x"yes"; then + HAVE_OGM_SUPPORT_TRUE= + HAVE_OGM_SUPPORT_FALSE='#' +else + HAVE_OGM_SUPPORT_TRUE='#' + HAVE_OGM_SUPPORT_FALSE= +fi + + + +# Check whether --enable-mkv-support was given. +if test "${enable_mkv_support+set}" = set; then + enableval=$enable_mkv_support; have_mkv_support="$enableval" +else + have_mkv_support="yes" fi + if test x"$have_mkv_support" = x"yes"; then HAVE_MKV_SUPPORT_TRUE= HAVE_MKV_SUPPORT_FALSE='#' @@ -22472,6 +22553,106 @@ +# Check whether --enable-mp4-support was given. +if test "${enable_mp4_support+set}" = set; then + enableval=$enable_mp4_support; have_mp4_support="$enableval" +else + have_mp4_support="yes" +fi + + + + +if test x"$have_mp4_support" = x"yes"; then + HAVE_MP4_SUPPORT_TRUE= + HAVE_MP4_SUPPORT_FALSE='#' +else + HAVE_MP4_SUPPORT_TRUE='#' + HAVE_MP4_SUPPORT_FALSE= +fi + + + +# Check whether --enable-lavf-support was given. +if test "${enable_lavf_support+set}" = set; then + enableval=$enable_lavf_support; have_lavf_support="$enableval" +else + have_lavf_support="yes" +fi + + + + +if test x"$have_lavf_support" = x"yes"; then + HAVE_LAVF_SUPPORT_TRUE= + HAVE_LAVF_SUPPORT_FALSE='#' +else + HAVE_LAVF_SUPPORT_TRUE='#' + HAVE_LAVF_SUPPORT_FALSE= +fi + + + +# Check whether --enable-xvid-support was given. +if test "${enable_xvid_support+set}" = set; then + enableval=$enable_xvid_support; have_xvid_support="$enableval" +else + have_xvid_support="yes" +fi + + + + +if test x"$have_xvid_support" = x"yes"; then + HAVE_XVID_SUPPORT_TRUE= + HAVE_XVID_SUPPORT_FALSE='#' +else + HAVE_XVID_SUPPORT_TRUE='#' + HAVE_XVID_SUPPORT_FALSE= +fi + + + +# Check whether --enable-lavc-support was given. +if test "${enable_lavc_support+set}" = set; then + enableval=$enable_lavc_support; have_lavc_support="$enableval" +else + have_lavc_support="yes" +fi + + + + +if test x"$have_lavc_support" = x"yes"; then + HAVE_LAVC_SUPPORT_TRUE= + HAVE_LAVC_SUPPORT_FALSE='#' +else + HAVE_LAVC_SUPPORT_TRUE='#' + HAVE_LAVC_SUPPORT_FALSE= +fi + + + +# Check whether --enable-x264-support was given. +if test "${enable_x264_support+set}" = set; then + enableval=$enable_x264_support; have_x264_support="$enableval" +else + have_x264_support="yes" +fi + + + + +if test x"$have_x264_support" = x"yes"; then + HAVE_X264_SUPPORT_TRUE= + HAVE_X264_SUPPORT_FALSE='#' +else + HAVE_X264_SUPPORT_TRUE='#' + HAVE_X264_SUPPORT_FALSE= +fi + + + THEORA_REQUIRED=1.0alpha5 THEORA_MODULES="theora >= $THEORA_REQUIRED" @@ -22489,11 +22670,10 @@ { echo "$as_me:$LINENO: checking for THEORA" >&5 echo $ECHO_N "checking for THEORA... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$THEORA_CFLAGS"; then - pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$THEORA_CFLAGS"; then + pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$THEORA_MODULES\"") >&5 ($PKG_CONFIG --exists --print-errors "$THEORA_MODULES") 2>&5 ac_status=$? @@ -22503,15 +22683,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$THEORA_LIBS"; then - pkg_cv_THEORA_LIBS="$THEORA_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$THEORA_LIBS"; then + pkg_cv_THEORA_LIBS="$THEORA_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$THEORA_MODULES\"") >&5 ($PKG_CONFIG --exists --print-errors "$THEORA_MODULES") 2>&5 ac_status=$? @@ -22521,9 +22699,8 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -22536,9 +22713,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$THEORA_MODULES"` + THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$THEORA_MODULES" 2>&1` else - THEORA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$THEORA_MODULES"` + THEORA_PKG_ERRORS=`$PKG_CONFIG --print-errors "$THEORA_MODULES" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$THEORA_PKG_ERRORS" >&5 @@ -22557,14 +22734,6 @@ fi fi -if test x"$have_theora_support" = x"yes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_THEORA_SUPPORT 1 -_ACEOF - -fi - if test x"$have_theora_support" = x"yes"; then @@ -22580,99 +22749,86 @@ -# Extract the first word of "gocr", so it can be a program name with args. -set dummy gocr; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_GOCR_PROG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --enable-vorbis-support was given. +if test "${enable_vorbis_support+set}" = set; then + enableval=$enable_vorbis_support; have_vorbis_support="$enableval" else - case $GOCR_PROG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GOCR_PROG="$GOCR_PROG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GOCR_PROG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + have_vorbis_support="yes" +fi - ;; -esac + + + +if test x"$have_vorbis_support" = x"yes"; then + HAVE_VORBIS_SUPPORT_TRUE= + HAVE_VORBIS_SUPPORT_FALSE='#' +else + HAVE_VORBIS_SUPPORT_TRUE='#' + HAVE_VORBIS_SUPPORT_FALSE= fi -GOCR_PROG=$ac_cv_path_GOCR_PROG -if test -n "$GOCR_PROG"; then - { echo "$as_me:$LINENO: result: $GOCR_PROG" >&5 -echo "${ECHO_T}$GOCR_PROG" >&6; } + + + +# Check whether --enable-mp3-support was given. +if test "${enable_mp3_support+set}" = set; then + enableval=$enable_mp3_support; have_mp3_support="$enableval" else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + have_mp3_support="yes" fi -if test x"$GOCR_PROG" != x; then - have_gocr_support=yes + + +if test x"$have_mp3_support" = x"yes"; then + HAVE_MP3_SUPPORT_TRUE= + HAVE_MP3_SUPPORT_FALSE='#' else - have_gocr_support=no + HAVE_MP3_SUPPORT_TRUE='#' + HAVE_MP3_SUPPORT_FALSE= fi -# Extract the first word of "ocrad", so it can be a program name with args. -set dummy ocrad; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_OCRAD_PROG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + +# Check whether --enable-aac-support was given. +if test "${enable_aac_support+set}" = set; then + enableval=$enable_aac_support; have_aac_support="$enableval" else - case $OCRAD_PROG in - [\\/]* | ?:[\\/]*) - ac_cv_path_OCRAD_PROG="$OCRAD_PROG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_OCRAD_PROG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + have_aac_support="yes" +fi - ;; -esac + + + +if test x"$have_aac_support" = x"yes"; then + HAVE_AAC_SUPPORT_TRUE= + HAVE_AAC_SUPPORT_FALSE='#' +else + HAVE_AAC_SUPPORT_TRUE='#' + HAVE_AAC_SUPPORT_FALSE= fi -OCRAD_PROG=$ac_cv_path_OCRAD_PROG -if test -n "$OCRAD_PROG"; then - { echo "$as_me:$LINENO: result: $OCRAD_PROG" >&5 -echo "${ECHO_T}$OCRAD_PROG" >&6; } + + + +# Check whether --enable-srt-support was given. +if test "${enable_srt_support+set}" = set; then + enableval=$enable_srt_support; have_srt_support="$enableval" else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + have_srt_support="yes" fi -if test x"$OCRAD_PROG" != x; then - have_ocrad_support=yes + + +if test x"$have_srt_support" = x"yes"; then + HAVE_SRT_SUPPORT_TRUE= + HAVE_SRT_SUPPORT_FALSE='#' else - have_ocrad_support=no + HAVE_SRT_SUPPORT_TRUE='#' + HAVE_SRT_SUPPORT_FALSE= fi + # Check whether --with-ocr was given. if test "${with_ocr+set}" = set; then withval=$with_ocr; @@ -22681,81 +22837,45 @@ fi -if test x"$with_ocr" = x"auto"; then - if test x"$have_gocr_support" = x"yes"; then +if test x"$have_srt_support" = x"yes"; then + if test x"$with_ocr" = x"auto"; then cat >>confdefs.h <<\_ACEOF #define HAVE_GOCR_SUPPORT 1 _ACEOF - elif test x"$have_ocrad_support" = x"yes"; then cat >>confdefs.h <<\_ACEOF #define HAVE_OCRAD_SUPPORT 1 _ACEOF - fi -elif test x"$with_ocr" = x"gocr"; then - if test x"$have_gocr_support" = x"no"; then - { { echo "$as_me:$LINENO: error: gocr explicitly requested but not found. Install gocr or try --with-ocr=ocrad" >&5 -echo "$as_me: error: gocr explicitly requested but not found. Install gocr or try --with-ocr=ocrad" >&2;} - { (exit 1); exit 1; }; } - fi cat >>confdefs.h <<\_ACEOF -#define HAVE_GOCR_SUPPORT 1 +#define HAVE_TESSERACT_SUPPORT 1 _ACEOF -elif test x"$with_ocr" = x"ocrad"; then - if test x"$have_ocrad_support" = x"no"; then - { { echo "$as_me:$LINENO: error: ocrad explicitly requested but not found. Install ocrad or try --with-ocr=gocr" >&5 -echo "$as_me: error: ocrad explicitly requested but not found. Install ocrad or try --with-ocr=gocr" >&2;} - { (exit 1); exit 1; }; } - fi + elif test x"$with_ocr" = x"gocr"; then cat >>confdefs.h <<\_ACEOF -#define HAVE_OCRAD_SUPPORT 1 +#define HAVE_GOCR_SUPPORT 1 _ACEOF -fi - -# Check whether --enable-srt-support was given. -if test "${enable_srt_support+set}" = set; then - enableval=$enable_srt_support; have_srt_support="$enableval" -else - have_srt_support="yes" -fi - - -if test x"$have_srt_support" != x"no"; then - if test x"$have_gocr_support" = x"yes"; then - have_srt_support=yes - fi - if test x"$have_ocrad_support" = x"yes"; then - have_srt_support=yes - fi -fi - -if test x"$have_srt_support" = x"yes"; then + elif test x"$with_ocr" = x"ocrad"; then cat >>confdefs.h <<\_ACEOF -#define HAVE_SRT_SUPPORT 1 +#define HAVE_OCRAD_SUPPORT 1 _ACEOF -fi - + elif test x"$with_ocr" = x"tesseract"; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_TESSERACT_SUPPORT 1 +_ACEOF -if test x"$have_srt_support" = x"yes"; then - HAVE_SRT_SUPPORT_TRUE= - HAVE_SRT_SUPPORT_FALSE='#' -else - HAVE_SRT_SUPPORT_TRUE='#' - HAVE_SRT_SUPPORT_FALSE= + fi fi - GTKNOTIFY_REQUIRED=2.10.0 LIBNOTIFY_REQUIRED=0.4.3 @@ -22775,11 +22895,10 @@ { echo "$as_me:$LINENO: checking for LIBNOTIFY" >&5 echo $ECHO_N "checking for LIBNOTIFY... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$LIBNOTIFY_CFLAGS"; then - pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$LIBNOTIFY_CFLAGS"; then + pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBNOTIFY_MODULES\"") >&5 ($PKG_CONFIG --exists --print-errors "$LIBNOTIFY_MODULES") 2>&5 ac_status=$? @@ -22789,15 +22908,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$LIBNOTIFY_LIBS"; then - pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$LIBNOTIFY_LIBS"; then + pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBNOTIFY_MODULES\"") >&5 ($PKG_CONFIG --exists --print-errors "$LIBNOTIFY_MODULES") 2>&5 ac_status=$? @@ -22807,9 +22924,8 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -22822,9 +22938,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBNOTIFY_MODULES"` + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBNOTIFY_MODULES" 2>&1` else - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBNOTIFY_MODULES"` + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBNOTIFY_MODULES" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBNOTIFY_PKG_ERRORS" >&5 @@ -23064,7 +23180,7 @@ fi fi - USE_NLS=yes + USE_NLS=yes gt_cv_have_gettext=no @@ -24425,6 +24541,7 @@ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -24445,24 +24562,18 @@ -# Use the tools built into the package, not the ones that are installed. -INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract' - -INTLTOOL_MERGE='$(top_builddir)/intltool-merge' - -INTLTOOL_UPDATE='$(top_builddir)/intltool-update' - -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 +# Check the gettext tools to make sure they are GNU +# Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then +if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $INTLTOOL_PERL in + case $XGETTEXT in [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path. + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -24472,7 +24583,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -24483,49 +24594,26 @@ ;; esac fi -INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL -if test -n "$INTLTOOL_PERL"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 -echo "${ECHO_T}$INTLTOOL_PERL" >&6; } +XGETTEXT=$ac_cv_path_XGETTEXT +if test -n "$XGETTEXT"; then + { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +echo "${ECHO_T}$XGETTEXT" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi -if test -z "$INTLTOOL_PERL"; then - { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 -echo "$as_me: error: perl not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5 -echo "$as_me: error: perl 5.x required for intltool" >&2;} - { (exit 1); exit 1; }; } -fi -if test "x" != "xno-xml"; then - { echo "$as_me:$LINENO: checking for XML::Parser" >&5 -echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; } - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } - else - { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 -echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} - { (exit 1); exit 1; }; } - fi -fi - -# Extract the first word of "iconv", so it can be a program name with args. -set dummy iconv; ac_word=$2 +# Extract the first word of "msgmerge", so it can be a program name with args. +set dummy msgmerge; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then +if test "${ac_cv_path_MSGMERGE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $INTLTOOL_ICONV in + case $MSGMERGE in [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path. + ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -24535,7 +24623,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -24543,14 +24631,13 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv" ;; esac fi -INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV -if test -n "$INTLTOOL_ICONV"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5 -echo "${ECHO_T}$INTLTOOL_ICONV" >&6; } +MSGMERGE=$ac_cv_path_MSGMERGE +if test -n "$MSGMERGE"; then + { echo "$as_me:$LINENO: result: $MSGMERGE" >&5 +echo "${ECHO_T}$MSGMERGE" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } @@ -24561,12 +24648,12 @@ set dummy msgfmt; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then +if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $INTLTOOL_MSGFMT in + case $MSGFMT in [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path. + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -24576,7 +24663,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -24584,71 +24671,51 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt" ;; esac fi -INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT -if test -n "$INTLTOOL_MSGFMT"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5 -echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; } +MSGFMT=$ac_cv_path_MSGFMT +if test -n "$MSGFMT"; then + { echo "$as_me:$LINENO: result: $MSGFMT" >&5 +echo "${ECHO_T}$MSGFMT" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi -# Extract the first word of "msgmerge", so it can be a program name with args. -set dummy msgmerge; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $INTLTOOL_MSGMERGE in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge" - ;; -esac +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} + { (exit 1); exit 1; }; } fi -INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE -if test -n "$INTLTOOL_MSGMERGE"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5 -echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} + { (exit 1); exit 1; }; } fi +# Use the tools built into the package, not the ones that are installed. +INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract' + +INTLTOOL_MERGE='$(top_builddir)/intltool-merge' -# Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 +INTLTOOL_UPDATE='$(top_builddir)/intltool-update' + + +# Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then +if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $INTLTOOL_XGETTEXT in + case $INTLTOOL_PERL in [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path. + ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -24658,7 +24725,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -24666,20 +24733,41 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext" ;; esac fi -INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT -if test -n "$INTLTOOL_XGETTEXT"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5 -echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; } +INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL +if test -n "$INTLTOOL_PERL"; then + { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 +echo "${ECHO_T}$INTLTOOL_PERL" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi +if test -z "$INTLTOOL_PERL"; then + { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 +echo "$as_me: error: perl not found; required for intltool" >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then + { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5 +echo "$as_me: error: perl 5.x required for intltool" >&2;} + { (exit 1); exit 1; }; } +fi +if test "x" != "xno-xml"; then + { echo "$as_me:$LINENO: checking for XML::Parser" >&5 +echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; } + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } + else + { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 +echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} + { (exit 1); exit 1; }; } + fi +fi # Substitute ALL_LINGUAS so we can use it in po/Makefile @@ -24698,7 +24786,7 @@ main () { extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr + return _nl_msg_cat_cntr ; return 0; } @@ -25063,17 +25151,24 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. +if test -z "${HAVE_PNG_SUPPORT_TRUE}" && test -z "${HAVE_PNG_SUPPORT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_PNG_SUPPORT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. +echo "$as_me: error: conditional \"HAVE_PNG_SUPPORT\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +if test -z "${HAVE_TIFF_SUPPORT_TRUE}" && test -z "${HAVE_TIFF_SUPPORT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_TIFF_SUPPORT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +echo "$as_me: error: conditional \"HAVE_TIFF_SUPPORT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -25098,10 +25193,24 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_X264_SUPPORT_TRUE}" && test -z "${HAVE_X264_SUPPORT_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_X264_SUPPORT\" was never defined. +if test -z "${HAVE_OGM_SUPPORT_TRUE}" && test -z "${HAVE_OGM_SUPPORT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_OGM_SUPPORT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_X264_SUPPORT\" was never defined. +echo "$as_me: error: conditional \"HAVE_OGM_SUPPORT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${HAVE_MKV_SUPPORT_TRUE}" && test -z "${HAVE_MKV_SUPPORT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_MKV_SUPPORT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_MKV_SUPPORT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${HAVE_MP4_SUPPORT_TRUE}" && test -z "${HAVE_MP4_SUPPORT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_MP4_SUPPORT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_MP4_SUPPORT\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -25112,24 +25221,24 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_DTS_SUPPORT_TRUE}" && test -z "${HAVE_DTS_SUPPORT_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_DTS_SUPPORT\" was never defined. +if test -z "${HAVE_XVID_SUPPORT_TRUE}" && test -z "${HAVE_XVID_SUPPORT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_XVID_SUPPORT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_DTS_SUPPORT\" was never defined. +echo "$as_me: error: conditional \"HAVE_XVID_SUPPORT\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_AAC_SUPPORT_TRUE}" && test -z "${HAVE_AAC_SUPPORT_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_AAC_SUPPORT\" was never defined. +if test -z "${HAVE_LAVC_SUPPORT_TRUE}" && test -z "${HAVE_LAVC_SUPPORT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_LAVC_SUPPORT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_AAC_SUPPORT\" was never defined. +echo "$as_me: error: conditional \"HAVE_LAVC_SUPPORT\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_MKV_SUPPORT_TRUE}" && test -z "${HAVE_MKV_SUPPORT_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_MKV_SUPPORT\" was never defined. +if test -z "${HAVE_X264_SUPPORT_TRUE}" && test -z "${HAVE_X264_SUPPORT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_X264_SUPPORT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_MKV_SUPPORT\" was never defined. +echo "$as_me: error: conditional \"HAVE_X264_SUPPORT\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -25140,6 +25249,27 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${HAVE_VORBIS_SUPPORT_TRUE}" && test -z "${HAVE_VORBIS_SUPPORT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_VORBIS_SUPPORT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_VORBIS_SUPPORT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${HAVE_MP3_SUPPORT_TRUE}" && test -z "${HAVE_MP3_SUPPORT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_MP3_SUPPORT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_MP3_SUPPORT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${HAVE_AAC_SUPPORT_TRUE}" && test -z "${HAVE_AAC_SUPPORT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_AAC_SUPPORT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_AAC_SUPPORT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${HAVE_SRT_SUPPORT_TRUE}" && test -z "${HAVE_SRT_SUPPORT_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"HAVE_SRT_SUPPORT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -25451,7 +25581,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OGMRip $as_me 0.11.1, which was +This file was extended by OGMRip $as_me 0.12.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25504,7 +25634,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OGMRip config.status 0.11.1 +OGMRip config.status 0.12.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -25611,9 +25741,7 @@ INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}' -INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}' -INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}' +INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' _ACEOF @@ -25798,6 +25926,12 @@ CCDEPMODE!$CCDEPMODE$ac_delim am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +CXX!$CXX$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim +CXXDEPMODE!$CXXDEPMODE$ac_delim +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim build!$build$ac_delim build_cpu!$build_cpu$ac_delim build_vendor!$build_vendor$ac_delim @@ -25811,12 +25945,6 @@ EGREP!$EGREP$ac_delim LN_S!$LN_S$ac_delim ECHO!$ECHO$ac_delim -AR!$AR$ac_delim -RANLIB!$RANLIB$ac_delim -CPP!$CPP$ac_delim -CXX!$CXX$ac_delim -CXXFLAGS!$CXXFLAGS$ac_delim -ac_ct_CXX!$ac_ct_CXX$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -25858,9 +25986,11 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -CXXDEPMODE!$CXXDEPMODE$ac_delim -am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim -am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +AR!$AR$ac_delim +RANLIB!$RANLIB$ac_delim +DSYMUTIL!$DSYMUTIL$ac_delim +NMEDIT!$NMEDIT$ac_delim +CPP!$CPP$ac_delim CXXCPP!$CXXCPP$ac_delim F77!$F77$ac_delim FFLAGS!$FFLAGS$ac_delim @@ -25871,6 +26001,7 @@ MAINT!$MAINT$ac_delim HTML_DIR!$HTML_DIR$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim +GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim @@ -25880,6 +26011,15 @@ HAVE_XSLTPROC_PROG_FALSE!$HAVE_XSLTPROC_PROG_FALSE$ac_delim OGMRIP_CFLAGS!$OGMRIP_CFLAGS$ac_delim OGMRIP_LIBS!$OGMRIP_LIBS$ac_delim +LIBXML_CFLAGS!$LIBXML_CFLAGS$ac_delim +LIBXML_LIBS!$LIBXML_LIBS$ac_delim +LIBPNG_CFLAGS!$LIBPNG_CFLAGS$ac_delim +LIBPNG_LIBS!$LIBPNG_LIBS$ac_delim +HAVE_PNG_SUPPORT_TRUE!$HAVE_PNG_SUPPORT_TRUE$ac_delim +HAVE_PNG_SUPPORT_FALSE!$HAVE_PNG_SUPPORT_FALSE$ac_delim +LIBTIFF_LIBS!$LIBTIFF_LIBS$ac_delim +HAVE_TIFF_SUPPORT_TRUE!$HAVE_TIFF_SUPPORT_TRUE$ac_delim +HAVE_TIFF_SUPPORT_FALSE!$HAVE_TIFF_SUPPORT_FALSE$ac_delim SED_PROG!$SED_PROG$ac_delim GUI_CFLAGS!$GUI_CFLAGS$ac_delim GUI_LIBS!$GUI_LIBS$ac_delim @@ -25899,33 +26039,31 @@ DVDREAD_LIBS!$DVDREAD_LIBS$ac_delim EJECT_PROG!$EJECT_PROG$ac_delim MPLAYER_PROG!$MPLAYER_PROG$ac_delim -MPLAYER_MAJOR_VERSION!$MPLAYER_MAJOR_VERSION$ac_delim -MPLAYER_MINOR_VERSION!$MPLAYER_MINOR_VERSION$ac_delim -MPLAYER_PRE_VERSION!$MPLAYER_PRE_VERSION$ac_delim -MPLAYER_RC_VERSION!$MPLAYER_RC_VERSION$ac_delim MENCODER_PROG!$MENCODER_PROG$ac_delim -OGMMERGE_PROG!$OGMMERGE_PROG$ac_delim -OGMSPLIT_PROG!$OGMSPLIT_PROG$ac_delim -OGGENC_PROG!$OGGENC_PROG$ac_delim -LAME_PROG!$LAME_PROG$ac_delim -HAVE_X264_SUPPORT_TRUE!$HAVE_X264_SUPPORT_TRUE$ac_delim -HAVE_X264_SUPPORT_FALSE!$HAVE_X264_SUPPORT_FALSE$ac_delim -HAVE_LAVF_SUPPORT_TRUE!$HAVE_LAVF_SUPPORT_TRUE$ac_delim -HAVE_LAVF_SUPPORT_FALSE!$HAVE_LAVF_SUPPORT_FALSE$ac_delim -HAVE_DTS_SUPPORT_TRUE!$HAVE_DTS_SUPPORT_TRUE$ac_delim -HAVE_DTS_SUPPORT_FALSE!$HAVE_DTS_SUPPORT_FALSE$ac_delim -FAAC_PROG!$FAAC_PROG$ac_delim -HAVE_AAC_SUPPORT_TRUE!$HAVE_AAC_SUPPORT_TRUE$ac_delim -HAVE_AAC_SUPPORT_FALSE!$HAVE_AAC_SUPPORT_FALSE$ac_delim -MKVMERGE_PROG!$MKVMERGE_PROG$ac_delim +HAVE_OGM_SUPPORT_TRUE!$HAVE_OGM_SUPPORT_TRUE$ac_delim +HAVE_OGM_SUPPORT_FALSE!$HAVE_OGM_SUPPORT_FALSE$ac_delim HAVE_MKV_SUPPORT_TRUE!$HAVE_MKV_SUPPORT_TRUE$ac_delim HAVE_MKV_SUPPORT_FALSE!$HAVE_MKV_SUPPORT_FALSE$ac_delim +HAVE_MP4_SUPPORT_TRUE!$HAVE_MP4_SUPPORT_TRUE$ac_delim +HAVE_MP4_SUPPORT_FALSE!$HAVE_MP4_SUPPORT_FALSE$ac_delim +HAVE_LAVF_SUPPORT_TRUE!$HAVE_LAVF_SUPPORT_TRUE$ac_delim +HAVE_LAVF_SUPPORT_FALSE!$HAVE_LAVF_SUPPORT_FALSE$ac_delim +HAVE_XVID_SUPPORT_TRUE!$HAVE_XVID_SUPPORT_TRUE$ac_delim +HAVE_XVID_SUPPORT_FALSE!$HAVE_XVID_SUPPORT_FALSE$ac_delim +HAVE_LAVC_SUPPORT_TRUE!$HAVE_LAVC_SUPPORT_TRUE$ac_delim +HAVE_LAVC_SUPPORT_FALSE!$HAVE_LAVC_SUPPORT_FALSE$ac_delim +HAVE_X264_SUPPORT_TRUE!$HAVE_X264_SUPPORT_TRUE$ac_delim +HAVE_X264_SUPPORT_FALSE!$HAVE_X264_SUPPORT_FALSE$ac_delim THEORA_CFLAGS!$THEORA_CFLAGS$ac_delim THEORA_LIBS!$THEORA_LIBS$ac_delim HAVE_THEORA_SUPPORT_TRUE!$HAVE_THEORA_SUPPORT_TRUE$ac_delim HAVE_THEORA_SUPPORT_FALSE!$HAVE_THEORA_SUPPORT_FALSE$ac_delim -GOCR_PROG!$GOCR_PROG$ac_delim -OCRAD_PROG!$OCRAD_PROG$ac_delim +HAVE_VORBIS_SUPPORT_TRUE!$HAVE_VORBIS_SUPPORT_TRUE$ac_delim +HAVE_VORBIS_SUPPORT_FALSE!$HAVE_VORBIS_SUPPORT_FALSE$ac_delim +HAVE_MP3_SUPPORT_TRUE!$HAVE_MP3_SUPPORT_TRUE$ac_delim +HAVE_MP3_SUPPORT_FALSE!$HAVE_MP3_SUPPORT_FALSE$ac_delim +HAVE_AAC_SUPPORT_TRUE!$HAVE_AAC_SUPPORT_TRUE$ac_delim +HAVE_AAC_SUPPORT_FALSE!$HAVE_AAC_SUPPORT_FALSE$ac_delim HAVE_SRT_SUPPORT_TRUE!$HAVE_SRT_SUPPORT_TRUE$ac_delim HAVE_SRT_SUPPORT_FALSE!$HAVE_SRT_SUPPORT_FALSE$ac_delim LIBNOTIFY_CFLAGS!$LIBNOTIFY_CFLAGS$ac_delim @@ -25945,16 +26083,6 @@ PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim POFILES!$POFILES$ac_delim -POSUB!$POSUB$ac_delim -MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim -INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim -INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim -INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim -INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim -INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim -INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim -INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim -INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -25996,6 +26124,16 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +POSUB!$POSUB$ac_delim +MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim +INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim +INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim +INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim +INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim +INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim +INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim +INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim +INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim @@ -26006,14 +26144,12 @@ INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim +INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim +MSGMERGE!$MSGMERGE$ac_delim INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim -INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim -INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim -INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim -INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim ALL_LINGUAS!$ALL_LINGUAS$ac_delim GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim OGMDVD_LT_VERSION!$OGMDVD_LT_VERSION$ac_delim @@ -26025,7 +26161,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -26592,10 +26728,6 @@ for file in intltool-extract intltool-merge intltool-update; do sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ - -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \ - -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \ - -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \ - -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ < ${ac_aux_dir}/${file}.in > ${file}.out if cmp -s ${file} ${file}.out 2>/dev/null; then @@ -26667,10 +26799,9 @@ { echo "$as_me:$LINENO: OGMRip was configured with the following options:" >&5 echo "$as_me: OGMRip was configured with the following options:" >&6;} -if test x"$have_mplayer_dev" = xyes; then - { echo "$as_me:$LINENO: ** MPlayer SVN/CVS detected - USE AT YOUR OWN RISK" >&5 -echo "$as_me: ** MPlayer SVN/CVS detected - USE AT YOUR OWN RISK" >&6;} -fi +# if test x"$have_mplayer_dev" = xyes; then +# AC_MSG_NOTICE([** MPlayer SVN/CVS detected - USE AT YOUR OWN RISK]) +# fi if test x"$have_gtk_support" = xyes; then { echo "$as_me:$LINENO: ** The GUI will be build" >&5 @@ -26688,6 +26819,30 @@ echo "$as_me: HAL support disabled" >&6;} fi +if test x"$have_enchant_support" = xyes; then + { echo "$as_me:$LINENO: ** Enchant support enabled" >&5 +echo "$as_me: ** Enchant support enabled" >&6;} +else + { echo "$as_me:$LINENO: Enchant support disabled" >&5 +echo "$as_me: Enchant support disabled" >&6;} +fi + +if test x"$have_libnotify_support" = xyes; then + { echo "$as_me:$LINENO: ** Notify support enabled" >&5 +echo "$as_me: ** Notify support enabled" >&6;} +else + { echo "$as_me:$LINENO: Notify support disabled" >&5 +echo "$as_me: Notify support disabled" >&6;} +fi + +if test x"$have_ogm_support" = xyes; then + { echo "$as_me:$LINENO: ** Ogg Media support enabled" >&5 +echo "$as_me: ** Ogg Media support enabled" >&6;} +else + { echo "$as_me:$LINENO: Ogg Media support disabled" >&5 +echo "$as_me: Ogg Media support disabled" >&6;} +fi + if test x"$have_mkv_support" = xyes; then { echo "$as_me:$LINENO: ** Matroska support enabled" >&5 echo "$as_me: ** Matroska support enabled" >&6;} @@ -26696,6 +26851,14 @@ echo "$as_me: Matroska support disabled" >&6;} fi +if test x"$have_mp4_support" = xyes; then + { echo "$as_me:$LINENO: ** Mpeg-4 support enabled" >&5 +echo "$as_me: ** Mpeg-4 support enabled" >&6;} +else + { echo "$as_me:$LINENO: Mpeg-4 support disabled" >&5 +echo "$as_me: Mpeg-4 support disabled" >&6;} +fi + if test x"$have_lavf_support" = xyes; then { echo "$as_me:$LINENO: ** Lavf support enabled" >&5 echo "$as_me: ** Lavf support enabled" >&6;} @@ -26704,6 +26867,22 @@ echo "$as_me: Lavf support disabled" >&6;} fi +if test x"$have_lavc_support" = xyes; then + { echo "$as_me:$LINENO: ** Lavc support enabled" >&5 +echo "$as_me: ** Lavc support enabled" >&6;} +else + { echo "$as_me:$LINENO: Lavc support disabled" >&5 +echo "$as_me: Lavc support disabled" >&6;} +fi + +if test x"$have_xvid_support" = xyes; then + { echo "$as_me:$LINENO: ** XviD support enabled" >&5 +echo "$as_me: ** XviD support enabled" >&6;} +else + { echo "$as_me:$LINENO: XviD support disabled" >&5 +echo "$as_me: XviD support disabled" >&6;} +fi + if test x"$have_x264_support" = xyes; then { echo "$as_me:$LINENO: ** X264 support enabled" >&5 echo "$as_me: ** X264 support enabled" >&6;} @@ -26713,19 +26892,27 @@ fi if test x"$have_theora_support" = xyes; then - { echo "$as_me:$LINENO: ** Theora support enabled" >&5 -echo "$as_me: ** Theora support enabled" >&6;} + { echo "$as_me:$LINENO: ** Ogg Theora support enabled" >&5 +echo "$as_me: ** Ogg Theora support enabled" >&6;} +else + { echo "$as_me:$LINENO: Ogg Theora support disabled" >&5 +echo "$as_me: Ogg Theora support disabled" >&6;} +fi + +if test x"$have_mp3_support" = xyes; then + { echo "$as_me:$LINENO: ** MP3 support enabled" >&5 +echo "$as_me: ** MP3 support enabled" >&6;} else - { echo "$as_me:$LINENO: Theora support disabled" >&5 -echo "$as_me: Theora support disabled" >&6;} + { echo "$as_me:$LINENO: MP3 support disabled" >&5 +echo "$as_me: MP3 support disabled" >&6;} fi -if test x"$have_dts_support" = xyes; then - { echo "$as_me:$LINENO: ** DTS support enabled" >&5 -echo "$as_me: ** DTS support enabled" >&6;} +if test x"$have_vorbis_support" = xyes; then + { echo "$as_me:$LINENO: ** Ogg Vorbis support enabled" >&5 +echo "$as_me: ** Ogg Vorbis support enabled" >&6;} else - { echo "$as_me:$LINENO: DTS support disabled" >&5 -echo "$as_me: DTS support disabled" >&6;} + { echo "$as_me:$LINENO: Ogg Vorbis support disabled" >&5 +echo "$as_me: Ogg Vorbis support disabled" >&6;} fi if test x"$have_aac_support" = xyes; then @@ -26744,11 +26931,3 @@ echo "$as_me: SRT support disabled" >&6;} fi -if test x"$have_enchant_support" = xyes; then - { echo "$as_me:$LINENO: ** Enchant support enabled" >&5 -echo "$as_me: ** Enchant support enabled" >&6;} -else - { echo "$as_me:$LINENO: Enchant support disabled" >&5 -echo "$as_me: Enchant support disabled" >&6;} -fi - diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/configure.in /tmp/v6alHitLZN/ogmrip-0.12.2/configure.in --- ogmrip-0.11.1/configure.in 2007-10-21 21:04:50.000000000 +0200 +++ ogmrip-0.12.2/configure.in 2008-09-21 14:16:27.000000000 +0200 @@ -3,8 +3,8 @@ AC_PREREQ(2.53) m4_define([ogmrip_major_version], [0]) -m4_define([ogmrip_minor_version], [11]) -m4_define([ogmrip_micro_version], [1]) +m4_define([ogmrip_minor_version], [12]) +m4_define([ogmrip_micro_version], [2]) m4_define([ogmrip_version], [ogmrip_major_version.ogmrip_minor_version.ogmrip_micro_version]) AC_INIT([OGMRip], [ogmrip_version]) @@ -28,10 +28,12 @@ dnl ************************************************************** AC_PROG_CC +AC_PROG_CXX AC_PROG_INSTALL AC_PROG_LIBTOOL AC_HEADER_STDC +AC_C_BIGENDIAN AM_MAINTAINER_MODE @@ -49,7 +51,7 @@ GTK_DOC_CHECK(1.0) -if test x"$have_gtk_doc" = x"yes"; then +if test x"$enable_gtk_doc" = x"yes"; then AC_PATH_PROG(XSLTPROC_PROG, xsltproc) if test x"$XSLTPROC_PROG" = x; then AC_MSG_ERROR(Unable to find xsltproc in the PATH. You need xsltproc to build the tutorial. Find it on http://www.xmlsoft.org) @@ -62,7 +64,7 @@ PKG_PROG_PKG_CONFIG -GLIB_REQUIRED=2.6.0 +GLIB_REQUIRED=2.14.0 GOBJECT_REQUIRED=2.6.0 GMODULE_REQUIRED=2.6.0 @@ -74,6 +76,33 @@ dnl ************************************************************** +PKG_CHECK_MODULES(LIBXML, "libxml-2.0") +AC_SUBST(LIBXML_CFLAGS) +AC_SUBST(LIBXML_LIBS) + +PKG_CHECK_MODULES(LIBPNG, "libpng", [have_png_support=yes], [have_png_support=no]) +AC_SUBST(LIBPNG_CFLAGS) +AC_SUBST(LIBPNG_LIBS) + +if test x"$have_png_support" = x"yes"; then + AC_DEFINE(HAVE_PNG_SUPPORT, 1, [Define to 1 if png is supported.]) +fi + +AM_CONDITIONAL(HAVE_PNG_SUPPORT, [test x"$have_png_support" = x"yes"]) + +AC_CHECK_LIB(tiff, TIFFOpen, [LIBTIFF_LIBS="-ltiff" && have_tiff_support=yes], [have_tiff_support=no]) +AC_SUBST(LIBTIFF_LIBS) + +if test x"$have_tiff_support" = x"yes"; then + AC_DEFINE(HAVE_TIFF_SUPPORT, 1, [Define to 1 if tiff is supported.]) +fi + +AM_CONDITIONAL(HAVE_TIFF_SUPPORT, [test x"$have_tiff_support" = x"yes"]) + +AC_PROG_LN_S + +dnl ************************************************************** + AC_PATH_PROG(SED_PROG, gsed) if test x"$SED_PROG" = x; then AC_PATH_PROG(SED_PROG, sed) @@ -102,7 +131,6 @@ AC_DEFINE(HAVE_GTK_SUPPORT, 1, [Define to 1 if gtk+ is supported.]) AC_PATH_PROG(GCONFTOOL, gconftool-2) AM_GCONF_SOURCE_2 - AC_PROG_CXX else AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, [false]) fi @@ -127,14 +155,13 @@ if test x"$have_hal_support" != x"no"; then PKG_CHECK_MODULES(HAL, $HAL4_MODULES, [have_hal_support=yes], [have_hal_support=no]) -fi - -if test x"$have_hal_support" = x"yes"; then - AC_DEFINE(USE_HAL4, 1, [Define to 1 if hal-0.4 is supported.]) -else - PKG_CHECK_MODULES(HAL, $HAL5_MODULES, [have_hal_support=yes], [have_hal_support=no]) if test x"$have_hal_support" = x"yes"; then - AC_DEFINE(USE_HAL5, 1, [Define to 1 if hal-0.5 is installed.]) + AC_DEFINE(USE_HAL4, 1, [Define to 1 if hal-0.4 is supported.]) + else + PKG_CHECK_MODULES(HAL, $HAL5_MODULES, [have_hal_support=yes], [have_hal_support=no]) + if test x"$have_hal_support" = x"yes"; then + AC_DEFINE(USE_HAL5, 1, [Define to 1 if hal-0.5 is installed.]) + fi fi fi @@ -197,49 +224,6 @@ AC_MSG_ERROR(Unable to find mplayer in the PATH. You need mplayer to use OGMRip. Find it on http://www.mplayerhq.hu) fi -MPLAYER_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer"` - -AC_ARG_WITH(mplayer-version, - AC_HELP_STRING([--with-mplayer-version=n.m((pre|rc)p)?], - [Force the version number of mplayer (i.e. 0.94, 1.0pre1, 1.0rc1, ...)]),,) - -if test x"$with_mplayer_version" != x; then - MPLAYER_VERSION="MPlayer $with_mplayer_version" -fi - -if echo $MPLAYER_VERSION | grep -q "MPlayer [[0-1]]\.[[0-9]]\+\(\(rc\|pre\)[[0-9]]\+\)\?"; then - have_mplayer_dev=no - MPLAYER_MAJOR_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer \([[0-1]]\).*%\1%'` - MPLAYER_MINOR_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.\([[0-9]]\).*%\1%'` - MPLAYER_PRE_VERSION=0 - MPLAYER_RC_VERSION=0 - - if echo $MPLAYER_VERSION | grep -q "^MPlayer [[0-1]]\.[[0-9]]\+pre[[0-9]]\+.*"; then - MPLAYER_PRE_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.[[0-9]]\+pre\([[0-9]]\+\).*%\1%'` - fi - - if echo $MPLAYER_VERSION | grep -q "^MPlayer [[0-1]]\.[[0-9]]\+rc[[0-9]]\+.*"; then - MPLAYER_RC_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.[[0-9]]\+rc\([[0-9]]\+\).*%\1%'` - fi -else - if echo $MPLAYER_VERSION | grep -q "dev-\(CVS\|SVN\)" || \ - echo $MPLAYER_VERSION | grep -q "SVN-"; then - have_mplayer_dev=yes - MPLAYER_MAJOR_VERSION=99 - MPLAYER_MINOR_VERSION=99 - MPLAYER_PRE_VERSION=99 - MPLAYER_RC_VERSION=99 - AC_MSG_WARN(Mplayer SVN/CVS detected - USE AT YOUR OWN RISK) - else - AC_MSG_ERROR(Unable to determine the version number of mplayer or the version number you specified with --with-mplayer-version is invalid.) - fi -fi - -AC_SUBST(MPLAYER_MAJOR_VERSION) -AC_SUBST(MPLAYER_MINOR_VERSION) -AC_SUBST(MPLAYER_PRE_VERSION) -AC_SUBST(MPLAYER_RC_VERSION) - dnl ************************************************************** AC_PATH_PROG(MENCODER_PROG, mencoder) @@ -249,151 +233,59 @@ dnl ************************************************************** -AC_PATH_PROG(OGMMERGE_PROG, ogmmerge) -if test x"$OGMMERGE_PROG" = x; then - AC_MSG_ERROR(Unable to find ogmmerge in the PATH. You need ogmmerge to use OGMRip. Find it on http://www.bunkus.org/videotools/ogmtools) -fi +AC_ARG_ENABLE(ogm-support, + AC_HELP_STRING([--disable-ogm-support], [disable OGM support]), + [have_ogm_support="$enableval"], [have_ogm_support="yes"]) -dnl ************************************************************** - -AC_PATH_PROG(OGMSPLIT_PROG, ogmsplit) -if test x"$OGMSPLIT_PROG" = x; then - AC_MSG_ERROR(Unable to find ogmsplit in the PATH. You need ogmsplit to use OGMRip. Find it on http://www.bunkus.org/videotools/ogmtools) -fi +AM_CONDITIONAL(HAVE_OGM_SUPPORT, [test x"$have_ogm_support" = x"yes"]) dnl ************************************************************** -AC_PATH_PROG(OGGENC_PROG, oggenc) -if test x"$OGGENC_PROG" = x; then - AC_MSG_ERROR(Unable to find oggenc in the PATH. You need oggenc to use OGMRip. Find it on http://www.xiph.org/ogg/vorbis) -fi - -dnl ************************************************************** - -AC_PATH_PROG(LAME_PROG, lame) -if test x"$LAME_PROG" = x; then - AC_MSG_ERROR(Unable to find lame in the PATH. You need lame to use OGMRip. Find it on http://lame.sourceforge.net) -fi - -dnl ************************************************************** - -AC_MSG_CHECKING([for XviD support]) -if $MENCODER_PROG -ovc help 2> /dev/null | grep -q "^ *xvid *- .*$"; then - result=yes -else - result=no -fi -AC_MSG_RESULT([$result]) - -if test x"$result" = x"no"; then - AC_MSG_ERROR(MPlayer is not build with XviD support. OGMRip requires XviD support in mplayer) -fi - -dnl ************************************************************** - -AC_MSG_CHECKING([for Lavc support]) -if $MENCODER_PROG -ovc help 2> /dev/null | grep -q "^ *lavc *- .*$"; then - result=yes -else - result=no -fi -AC_MSG_RESULT([$result]) +AC_ARG_ENABLE(mkv-support, + AC_HELP_STRING([--disable-mkv-support], [disable Matroska support]), + [have_mkv_support="$enableval"], [have_mkv_support="yes"]) -if test x"$result" = x"no"; then - AC_MSG_ERROR(MPlayer is not build with Lavc support. OGMRip requires Lavc support in mplayer) -fi +AM_CONDITIONAL(HAVE_MKV_SUPPORT, [test x"$have_mkv_support" = x"yes"]) dnl ************************************************************** -AC_MSG_CHECKING([for x264 support]) -if $MENCODER_PROG -ovc help 2> /dev/null | grep -q "^ *x264 *- .*$"; then - have_x264_support=yes -else - have_x264_support=no -fi -AC_MSG_RESULT([$have_x264_support]) - -if test x"$have_x264_support" = x"yes"; then - AC_DEFINE(HAVE_X264_SUPPORT, 1, [Define to 1 if MPlayer is build with x264 support.]) -fi +AC_ARG_ENABLE(mp4-support, + AC_HELP_STRING([--disable-mp4-support], [disable Mpeg-4 support]), + [have_mp4_support="$enableval"], [have_mp4_support="yes"]) -AM_CONDITIONAL(HAVE_X264_SUPPORT, [test x"$have_x264_support" = x"yes"]) +AM_CONDITIONAL(HAVE_MP4_SUPPORT, [test x"$have_mp4_support" = x"yes"]) dnl ************************************************************** -AC_MSG_CHECKING([for Lavf support]) -if $MENCODER_PROG -of help 2> /dev/null | grep -q "^ *lavf *- .*$"; then - have_lavf_support=yes -else - have_lavf_support=no -fi -AC_MSG_RESULT([$have_lavf_support]) - -if test x"$have_lavf_support" = x"yes"; then - AC_DEFINE(HAVE_LAVF_SUPPORT, 1, [Define to 1 if MPlayer is build with lavf support.]) -fi +AC_ARG_ENABLE(lavf-support, + AC_HELP_STRING([--disable-lavf-support], [disable Lavf support]), + [have_lavf_support="$enableval"], [have_lavf_support="yes"]) AM_CONDITIONAL(HAVE_LAVF_SUPPORT, [test x"$have_lavf_support" = x"yes"]) dnl ************************************************************** -AC_MSG_CHECKING([for DTS support]) -if $MPLAYER_PROG -ac help 2> /dev/null | grep -q "^\(ffdts\|ffdca\|dts\).*working.*$"; then - have_dts_support=yes -else - have_dts_support=no -fi -AC_MSG_RESULT([$have_dts_support]) +AC_ARG_ENABLE(xvid-support, + AC_HELP_STRING([--disable-xvid-support], [disable XviD support]), + [have_xvid_support="$enableval"], [have_xvid_support="yes"]) -if test x"$have_dts_support" = x"yes"; then - AC_DEFINE(HAVE_DTS_SUPPORT, 1, [Define to 1 if MPlayer is build with DTS support.]) -fi - -AM_CONDITIONAL(HAVE_DTS_SUPPORT, [test x"$have_dts_support" = x"yes"]) +AM_CONDITIONAL(HAVE_XVID_SUPPORT, [test x"$have_xvid_support" = x"yes"]) dnl ************************************************************** -AC_ARG_ENABLE(aac-support, - AC_HELP_STRING([--disable-aac-support], [disable AAC support]), - [have_aac_support="$enableval"], [have_aac_support="yes"]) +AC_ARG_ENABLE(lavc-support, + AC_HELP_STRING([--disable-lavc-support], [disable Lavc support]), + [have_lavc_support="$enableval"], [have_lavc_support="yes"]) -if test x"$have_aac_support" != x"no"; then - AC_PATH_PROG(FAAC_PROG, faac) - if test x"$FAAC_PROG" != x; then - have_aac_support=yes - else - have_aac_support=no - fi -fi - -if test x"$have_aac_support" = x"yes"; then - AC_DEFINE(HAVE_AAC_SUPPORT, 1, [Define to 1 if faac is in PATH.]) -fi - -AM_CONDITIONAL(HAVE_AAC_SUPPORT, [test x"$have_aac_support" = x"yes"]) +AM_CONDITIONAL(HAVE_LAVC_SUPPORT, [test x"$have_lavc_support" = x"yes"]) dnl ************************************************************** -AC_ARG_ENABLE(matroska-support, - AC_HELP_STRING([--disable-matroska-support], [disable Matroska support]), - [have_mkv_support="$enableval"], [have_mkv_support="yes"]) - -if test x"$have_mkv_support" != x"no"; then - AC_PATH_PROG(MKVMERGE_PROG, mkvmerge) - if test x"$MKVMERGE_PROG" != x; then - have_mkv_support=yes - else - have_mkv_support=no - fi -fi +AC_ARG_ENABLE(x264-support, + AC_HELP_STRING([--disable-x264-support], [disable X264 support]), + [have_x264_support="$enableval"], [have_x264_support="yes"]) -if test x"$have_mkv_support" = x"yes"; then - AC_DEFINE(HAVE_MKV_SUPPORT, 1, [Define to 1 if mkvmerge is in PATH.]) - MKVMERGE_MAJOR_VERSION=`$MKVMERGE_PROG --version 2> /dev/null | $SED_PROG -e 's%^mkvmerge v\([[0-9]]\).*%\1%'` - AC_DEFINE_UNQUOTED(MKVMERGE_MAJOR_VERSION, $MKVMERGE_MAJOR_VERSION, [mkvmerge major version number]) -fi - -AM_CONDITIONAL(HAVE_MKV_SUPPORT, [test x"$have_mkv_support" = x"yes"]) +AM_CONDITIONAL(HAVE_X264_SUPPORT, [test x"$have_x264_support" = x"yes"]) dnl ************************************************************** @@ -408,10 +300,6 @@ PKG_CHECK_MODULES(THEORA, $THEORA_MODULES, [have_theora_support=yes], [have_theora_support=no]) fi -if test x"$have_theora_support" = x"yes"; then - AC_DEFINE(HAVE_THEORA_SUPPORT, 1, [Define to 1 if theora is supported.]) -fi - AM_CONDITIONAL(HAVE_THEORA_SUPPORT, [test x"$have_theora_support" = x"yes"]) AC_SUBST(THEORA_CFLAGS) @@ -419,62 +307,55 @@ dnl ************************************************************** -AC_PATH_PROG(GOCR_PROG, gocr) -if test x"$GOCR_PROG" != x; then - have_gocr_support=yes -else - have_gocr_support=no -fi +AC_ARG_ENABLE(vorbis-support, + AC_HELP_STRING([--disable-vorbis-support], [disable Ogg Vorbis support]), + [have_vorbis_support="$enableval"], [have_vorbis_support="yes"]) -AC_PATH_PROG(OCRAD_PROG, ocrad) -if test x"$OCRAD_PROG" != x; then - have_ocrad_support=yes -else - have_ocrad_support=no -fi +AM_CONDITIONAL(HAVE_VORBIS_SUPPORT, [test x"$have_vorbis_support" = x"yes"]) -AC_ARG_WITH(ocr, - AC_HELP_STRING([--with-ocr=auto|gocr|ocrad], - [Select the OCR program to use (default gocr)]),, - with_ocr=auto) +dnl ************************************************************** -if test x"$with_ocr" = x"auto"; then - if test x"$have_gocr_support" = x"yes"; then - AC_DEFINE(HAVE_GOCR_SUPPORT, 1, [Define to 1 if gocr is in PATH.]) - elif test x"$have_ocrad_support" = x"yes"; then - AC_DEFINE(HAVE_OCRAD_SUPPORT, 1, [Define to 1 if ocrad is in PATH.]) - fi -elif test x"$with_ocr" = x"gocr"; then - if test x"$have_gocr_support" = x"no"; then - AC_MSG_ERROR([gocr explicitly requested but not found. Install gocr or try --with-ocr=ocrad]) - fi - AC_DEFINE(HAVE_GOCR_SUPPORT, 1, [Define to 1 if gocr is in PATH.]) -elif test x"$with_ocr" = x"ocrad"; then - if test x"$have_ocrad_support" = x"no"; then - AC_MSG_ERROR([ocrad explicitly requested but not found. Install ocrad or try --with-ocr=gocr]) - fi - AC_DEFINE(HAVE_OCRAD_SUPPORT, 1, [Define to 1 if ocrad is in PATH.]) -fi +AC_ARG_ENABLE(mp3-support, + AC_HELP_STRING([--disable-mp3-support], [disable Mp3 support]), + [have_mp3_support="$enableval"], [have_mp3_support="yes"]) + +AM_CONDITIONAL(HAVE_MP3_SUPPORT, [test x"$have_mp3_support" = x"yes"]) + +dnl ************************************************************** + +AC_ARG_ENABLE(aac-support, + AC_HELP_STRING([--disable-aac-support], [disable AAC support]), + [have_aac_support="$enableval"], [have_aac_support="yes"]) + +AM_CONDITIONAL(HAVE_AAC_SUPPORT, [test x"$have_aac_support" = x"yes"]) + +dnl ************************************************************** AC_ARG_ENABLE(srt-support, AC_HELP_STRING([--disable-srt-support], [disable SRT support]), [have_srt_support="$enableval"], [have_srt_support="yes"]) -if test x"$have_srt_support" != x"no"; then - if test x"$have_gocr_support" = x"yes"; then - have_srt_support=yes - fi - if test x"$have_ocrad_support" = x"yes"; then - have_srt_support=yes - fi -fi +AM_CONDITIONAL(HAVE_SRT_SUPPORT, [test x"$have_srt_support" = x"yes"]) + +AC_ARG_WITH(ocr, + AC_HELP_STRING([--with-ocr=auto|gocr|ocrad|tesseract], + [Select the OCR program to use (default gocr)]),, + with_ocr=auto) if test x"$have_srt_support" = x"yes"; then - AC_DEFINE(HAVE_SRT_SUPPORT, 1, [Define to 1 if srt support is enabled.]) + if test x"$with_ocr" = x"auto"; then + AC_DEFINE(HAVE_GOCR_SUPPORT, 1, [Define to 1 if gocr should be supported.]) + AC_DEFINE(HAVE_OCRAD_SUPPORT, 1, [Define to 1 if ocrad should be supported.]) + AC_DEFINE(HAVE_TESSERACT_SUPPORT, 1, [Define to 1 if ocrad should be supported.]) + elif test x"$with_ocr" = x"gocr"; then + AC_DEFINE(HAVE_GOCR_SUPPORT, 1, [Define to 1 if gocr is should be supported.]) + elif test x"$with_ocr" = x"ocrad"; then + AC_DEFINE(HAVE_OCRAD_SUPPORT, 1, [Define to 1 if ocrad is should be supported.]) + elif test x"$with_ocr" = x"tesseract"; then + AC_DEFINE(HAVE_TESSERACT_SUPPORT, 1, [Define to 1 if tesseract is should be supported.]) + fi fi -AM_CONDITIONAL(HAVE_SRT_SUPPORT, [test x"$have_srt_support" = x"yes"]) - dnl ************************************************************** GTKNOTIFY_REQUIRED=2.10.0 @@ -579,9 +460,9 @@ AC_MSG_NOTICE([OGMRip was configured with the following options:]) -if test x"$have_mplayer_dev" = xyes; then - AC_MSG_NOTICE([** MPlayer SVN/CVS detected - USE AT YOUR OWN RISK]) -fi +# if test x"$have_mplayer_dev" = xyes; then +# AC_MSG_NOTICE([** MPlayer SVN/CVS detected - USE AT YOUR OWN RISK]) +# fi if test x"$have_gtk_support" = xyes; then AC_MSG_NOTICE([** The GUI will be build]) @@ -595,18 +476,54 @@ AC_MSG_NOTICE([ HAL support disabled]) fi +if test x"$have_enchant_support" = xyes; then + AC_MSG_NOTICE([** Enchant support enabled]) +else + AC_MSG_NOTICE([ Enchant support disabled]) +fi + +if test x"$have_libnotify_support" = xyes; then + AC_MSG_NOTICE([** Notify support enabled]) +else + AC_MSG_NOTICE([ Notify support disabled]) +fi + +if test x"$have_ogm_support" = xyes; then + AC_MSG_NOTICE([** Ogg Media support enabled]) +else + AC_MSG_NOTICE([ Ogg Media support disabled]) +fi + if test x"$have_mkv_support" = xyes; then AC_MSG_NOTICE([** Matroska support enabled]) else AC_MSG_NOTICE([ Matroska support disabled]) fi +if test x"$have_mp4_support" = xyes; then + AC_MSG_NOTICE([** Mpeg-4 support enabled]) +else + AC_MSG_NOTICE([ Mpeg-4 support disabled]) +fi + if test x"$have_lavf_support" = xyes; then AC_MSG_NOTICE([** Lavf support enabled]) else AC_MSG_NOTICE([ Lavf support disabled]) fi +if test x"$have_lavc_support" = xyes; then + AC_MSG_NOTICE([** Lavc support enabled]) +else + AC_MSG_NOTICE([ Lavc support disabled]) +fi + +if test x"$have_xvid_support" = xyes; then + AC_MSG_NOTICE([** XviD support enabled]) +else + AC_MSG_NOTICE([ XviD support disabled]) +fi + if test x"$have_x264_support" = xyes; then AC_MSG_NOTICE([** X264 support enabled]) else @@ -614,15 +531,21 @@ fi if test x"$have_theora_support" = xyes; then - AC_MSG_NOTICE([** Theora support enabled]) + AC_MSG_NOTICE([** Ogg Theora support enabled]) else - AC_MSG_NOTICE([ Theora support disabled]) + AC_MSG_NOTICE([ Ogg Theora support disabled]) fi -if test x"$have_dts_support" = xyes; then - AC_MSG_NOTICE([** DTS support enabled]) +if test x"$have_mp3_support" = xyes; then + AC_MSG_NOTICE([** MP3 support enabled]) else - AC_MSG_NOTICE([ DTS support disabled]) + AC_MSG_NOTICE([ MP3 support disabled]) +fi + +if test x"$have_vorbis_support" = xyes; then + AC_MSG_NOTICE([** Ogg Vorbis support enabled]) +else + AC_MSG_NOTICE([ Ogg Vorbis support disabled]) fi if test x"$have_aac_support" = xyes; then @@ -637,9 +560,3 @@ AC_MSG_NOTICE([ SRT support disabled]) fi -if test x"$have_enchant_support" = xyes; then - AC_MSG_NOTICE([** Enchant support enabled]) -else - AC_MSG_NOTICE([ Enchant support disabled]) -fi - diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/Makefile.am /tmp/v6alHitLZN/ogmrip-0.12.2/data/Makefile.am --- ogmrip-0.11.1/data/Makefile.am 2007-10-07 21:03:55.000000000 +0200 +++ ogmrip-0.12.2/data/Makefile.am 2008-06-09 21:01:25.000000000 +0200 @@ -4,16 +4,26 @@ ui_DATA = ogmrip-ui.xml gladedir = $(datadir)/ogmrip -glade_DATA = ogmrip-crop.glade \ - ogmrip-main.glade \ - ogmrip-options.glade \ - ogmrip-pref.glade \ - ogmrip-progress.glade \ - ogmrip-spell.glade +glade_DATA = ogmrip-crop.glade \ + ogmrip-main.glade \ + ogmrip-options.glade \ + ogmrip-pref.glade \ + ogmrip-profile-editor.glade \ + ogmrip-profiles.glade \ + ogmrip-progress.glade \ + ogmrip-simple-editor.glade \ + ogmrip-spell.glade \ + ogmrip-lavc.glade \ + ogmrip-x264.glade pixmapdir = $(datadir)/pixmaps pixmap_DATA = ogmrip.png +profilesdir = $(datadir)/ogmrip/profiles +profilesfile = profiles.xml.in +profiles_DATA = $(profilesfile:.xml.in=.xml) +@INTLTOOL_XML_RULE@ + desktopdir = $(datadir)/applications desktopfile = ogmrip.desktop.in desktop_DATA = $(desktopfile:.desktop.in=.desktop) @@ -34,19 +44,27 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = ogmrip.pc \ - ogmrip-gtk.pc \ + ogmrip-gtk.pc \ ogmdvd.pc \ ogmdvd-gtk.pc \ ogmjob.pc -EXTRA_DIST = \ - $(ui_DATA) \ - $(glade_DATA) \ - $(pixmap_DATA) \ - $(desktop_DATA) \ - $(schemas_DATA) +EXTRA_DIST = \ + $(ui_DATA) \ + $(glade_DATA) \ + $(pixmap_DATA) \ + $(desktop_DATA) \ + $(schemas_DATA) \ + $(profiles_DATA) \ + $(profilesfile) \ + $(desktopfile) CLEANFILES = \ *.gladep \ *.bak +DISTCLEANFILES = \ + ogmrip.desktop \ + ogmrip.schemas \ + profiles.xml + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/Makefile.in /tmp/v6alHitLZN/ogmrip-0.12.2/data/Makefile.in --- ogmrip-0.11.1/data/Makefile.in 2007-10-21 21:05:55.000000000 +0200 +++ ogmrip-0.12.2/data/Makefile.in 2008-09-21 14:16:34.000000000 +0200 @@ -42,8 +42,7 @@ $(srcdir)/ogmjob.pc.in $(srcdir)/ogmrip-gtk.pc.in \ $(srcdir)/ogmrip.pc.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -60,15 +59,17 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)" \ "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(pkgconfigdir)" \ - "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(uidir)" + "$(DESTDIR)$(profilesdir)" "$(DESTDIR)$(schemasdir)" \ + "$(DESTDIR)$(uidir)" desktopDATA_INSTALL = $(INSTALL_DATA) gladeDATA_INSTALL = $(INSTALL_DATA) pixmapDATA_INSTALL = $(INSTALL_DATA) pkgconfigDATA_INSTALL = $(INSTALL_DATA) +profilesDATA_INSTALL = $(INSTALL_DATA) schemasDATA_INSTALL = $(INSTALL_DATA) uiDATA_INSTALL = $(INSTALL_DATA) DATA = $(desktop_DATA) $(glade_DATA) $(pixmap_DATA) $(pkgconfig_DATA) \ - $(schemas_DATA) $(ui_DATA) + $(profiles_DATA) $(schemas_DATA) $(ui_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -95,6 +96,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ DVDREAD_LIBS = @DVDREAD_LIBS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -108,7 +110,6 @@ ENCHANT_LIBS = @ENCHANT_LIBS@ EXEEXT = @EXEEXT@ F77 = @F77@ -FAAC_PROG = @FAAC_PROG@ FFLAGS = @FFLAGS@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ @@ -119,8 +120,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GOCR_PROG = @GOCR_PROG@ GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ GUI_CFLAGS = @GUI_CFLAGS@ @@ -129,24 +130,38 @@ HAL_LIBS = @HAL_LIBS@ HAVE_AAC_SUPPORT_FALSE = @HAVE_AAC_SUPPORT_FALSE@ HAVE_AAC_SUPPORT_TRUE = @HAVE_AAC_SUPPORT_TRUE@ -HAVE_DTS_SUPPORT_FALSE = @HAVE_DTS_SUPPORT_FALSE@ -HAVE_DTS_SUPPORT_TRUE = @HAVE_DTS_SUPPORT_TRUE@ HAVE_ENCHANT_SUPPORT_FALSE = @HAVE_ENCHANT_SUPPORT_FALSE@ HAVE_ENCHANT_SUPPORT_TRUE = @HAVE_ENCHANT_SUPPORT_TRUE@ HAVE_GTK_SUPPORT_FALSE = @HAVE_GTK_SUPPORT_FALSE@ HAVE_GTK_SUPPORT_TRUE = @HAVE_GTK_SUPPORT_TRUE@ +HAVE_LAVC_SUPPORT_FALSE = @HAVE_LAVC_SUPPORT_FALSE@ +HAVE_LAVC_SUPPORT_TRUE = @HAVE_LAVC_SUPPORT_TRUE@ HAVE_LAVF_SUPPORT_FALSE = @HAVE_LAVF_SUPPORT_FALSE@ HAVE_LAVF_SUPPORT_TRUE = @HAVE_LAVF_SUPPORT_TRUE@ HAVE_MKV_SUPPORT_FALSE = @HAVE_MKV_SUPPORT_FALSE@ HAVE_MKV_SUPPORT_TRUE = @HAVE_MKV_SUPPORT_TRUE@ +HAVE_MP3_SUPPORT_FALSE = @HAVE_MP3_SUPPORT_FALSE@ +HAVE_MP3_SUPPORT_TRUE = @HAVE_MP3_SUPPORT_TRUE@ +HAVE_MP4_SUPPORT_FALSE = @HAVE_MP4_SUPPORT_FALSE@ +HAVE_MP4_SUPPORT_TRUE = @HAVE_MP4_SUPPORT_TRUE@ +HAVE_OGM_SUPPORT_FALSE = @HAVE_OGM_SUPPORT_FALSE@ +HAVE_OGM_SUPPORT_TRUE = @HAVE_OGM_SUPPORT_TRUE@ +HAVE_PNG_SUPPORT_FALSE = @HAVE_PNG_SUPPORT_FALSE@ +HAVE_PNG_SUPPORT_TRUE = @HAVE_PNG_SUPPORT_TRUE@ HAVE_SRT_SUPPORT_FALSE = @HAVE_SRT_SUPPORT_FALSE@ HAVE_SRT_SUPPORT_TRUE = @HAVE_SRT_SUPPORT_TRUE@ HAVE_THEORA_SUPPORT_FALSE = @HAVE_THEORA_SUPPORT_FALSE@ HAVE_THEORA_SUPPORT_TRUE = @HAVE_THEORA_SUPPORT_TRUE@ +HAVE_TIFF_SUPPORT_FALSE = @HAVE_TIFF_SUPPORT_FALSE@ +HAVE_TIFF_SUPPORT_TRUE = @HAVE_TIFF_SUPPORT_TRUE@ +HAVE_VORBIS_SUPPORT_FALSE = @HAVE_VORBIS_SUPPORT_FALSE@ +HAVE_VORBIS_SUPPORT_TRUE = @HAVE_VORBIS_SUPPORT_TRUE@ HAVE_X264_SUPPORT_FALSE = @HAVE_X264_SUPPORT_FALSE@ HAVE_X264_SUPPORT_TRUE = @HAVE_X264_SUPPORT_TRUE@ HAVE_XSLTPROC_PROG_FALSE = @HAVE_XSLTPROC_PROG_FALSE@ HAVE_XSLTPROC_PROG_TRUE = @HAVE_XSLTPROC_PROG_TRUE@ +HAVE_XVID_SUPPORT_FALSE = @HAVE_XVID_SUPPORT_FALSE@ +HAVE_XVID_SUPPORT_TRUE = @HAVE_XVID_SUPPORT_TRUE@ HTML_DIR = @HTML_DIR@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -158,14 +173,12 @@ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_ICONV = @INTLTOOL_ICONV@ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -177,16 +190,19 @@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -LAME_PROG = @LAME_PROG@ LDFLAGS = @LDFLAGS@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ +LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBTIFF_LIBS = @LIBTIFF_LIBS@ LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -195,21 +211,15 @@ MAKEINFO = @MAKEINFO@ MENCODER_PROG = @MENCODER_PROG@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MKVMERGE_PROG = @MKVMERGE_PROG@ -MPLAYER_MAJOR_VERSION = @MPLAYER_MAJOR_VERSION@ -MPLAYER_MINOR_VERSION = @MPLAYER_MINOR_VERSION@ -MPLAYER_PRE_VERSION = @MPLAYER_PRE_VERSION@ MPLAYER_PROG = @MPLAYER_PROG@ -MPLAYER_RC_VERSION = @MPLAYER_RC_VERSION@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ -OCRAD_PROG = @OCRAD_PROG@ -OGGENC_PROG = @OGGENC_PROG@ OGMDVD_GTK_LT_VERSION = @OGMDVD_GTK_LT_VERSION@ OGMDVD_LT_VERSION = @OGMDVD_LT_VERSION@ OGMJOB_LT_VERSION = @OGMJOB_LT_VERSION@ -OGMMERGE_PROG = @OGMMERGE_PROG@ OGMRIP_CFLAGS = @OGMRIP_CFLAGS@ OGMRIP_GTK_LT_VERSION = @OGMRIP_GTK_LT_VERSION@ OGMRIP_LIBS = @OGMRIP_LIBS@ @@ -218,7 +228,6 @@ OGMRIP_MICRO_VERSION = @OGMRIP_MICRO_VERSION@ OGMRIP_MINOR_VERSION = @OGMRIP_MINOR_VERSION@ OGMRIP_VERSION = @OGMRIP_VERSION@ -OGMSPLIT_PROG = @OGMSPLIT_PROG@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -293,15 +302,23 @@ @HAVE_GTK_SUPPORT_TRUE@uidir = $(datadir)/ogmrip @HAVE_GTK_SUPPORT_TRUE@ui_DATA = ogmrip-ui.xml @HAVE_GTK_SUPPORT_TRUE@gladedir = $(datadir)/ogmrip -@HAVE_GTK_SUPPORT_TRUE@glade_DATA = ogmrip-crop.glade \ -@HAVE_GTK_SUPPORT_TRUE@ ogmrip-main.glade \ -@HAVE_GTK_SUPPORT_TRUE@ ogmrip-options.glade \ -@HAVE_GTK_SUPPORT_TRUE@ ogmrip-pref.glade \ -@HAVE_GTK_SUPPORT_TRUE@ ogmrip-progress.glade \ -@HAVE_GTK_SUPPORT_TRUE@ ogmrip-spell.glade +@HAVE_GTK_SUPPORT_TRUE@glade_DATA = ogmrip-crop.glade \ +@HAVE_GTK_SUPPORT_TRUE@ ogmrip-main.glade \ +@HAVE_GTK_SUPPORT_TRUE@ ogmrip-options.glade \ +@HAVE_GTK_SUPPORT_TRUE@ ogmrip-pref.glade \ +@HAVE_GTK_SUPPORT_TRUE@ ogmrip-profile-editor.glade \ +@HAVE_GTK_SUPPORT_TRUE@ ogmrip-profiles.glade \ +@HAVE_GTK_SUPPORT_TRUE@ ogmrip-progress.glade \ +@HAVE_GTK_SUPPORT_TRUE@ ogmrip-simple-editor.glade \ +@HAVE_GTK_SUPPORT_TRUE@ ogmrip-spell.glade \ +@HAVE_GTK_SUPPORT_TRUE@ ogmrip-lavc.glade \ +@HAVE_GTK_SUPPORT_TRUE@ ogmrip-x264.glade @HAVE_GTK_SUPPORT_TRUE@pixmapdir = $(datadir)/pixmaps @HAVE_GTK_SUPPORT_TRUE@pixmap_DATA = ogmrip.png +@HAVE_GTK_SUPPORT_TRUE@profilesdir = $(datadir)/ogmrip/profiles +@HAVE_GTK_SUPPORT_TRUE@profilesfile = profiles.xml.in +@HAVE_GTK_SUPPORT_TRUE@profiles_DATA = $(profilesfile:.xml.in=.xml) @HAVE_GTK_SUPPORT_TRUE@desktopdir = $(datadir)/applications @HAVE_GTK_SUPPORT_TRUE@desktopfile = ogmrip.desktop.in @HAVE_GTK_SUPPORT_TRUE@desktop_DATA = $(desktopfile:.desktop.in=.desktop) @@ -310,22 +327,30 @@ @HAVE_GTK_SUPPORT_TRUE@schemas_DATA = $(schemasfile:.schemas.in=.schemas) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = ogmrip.pc \ - ogmrip-gtk.pc \ + ogmrip-gtk.pc \ ogmdvd.pc \ ogmdvd-gtk.pc \ ogmjob.pc EXTRA_DIST = \ - $(ui_DATA) \ - $(glade_DATA) \ - $(pixmap_DATA) \ - $(desktop_DATA) \ - $(schemas_DATA) + $(ui_DATA) \ + $(glade_DATA) \ + $(pixmap_DATA) \ + $(desktop_DATA) \ + $(schemas_DATA) \ + $(profiles_DATA) \ + $(profilesfile) \ + $(desktopfile) CLEANFILES = \ *.gladep \ *.bak +DISTCLEANFILES = \ + ogmrip.desktop \ + ogmrip.schemas \ + profiles.xml + all: all-am .SUFFIXES: @@ -446,6 +471,23 @@ echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ done +install-profilesDATA: $(profiles_DATA) + @$(NORMAL_INSTALL) + test -z "$(profilesdir)" || $(mkdir_p) "$(DESTDIR)$(profilesdir)" + @list='$(profiles_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(profilesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(profilesdir)/$$f'"; \ + $(profilesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(profilesdir)/$$f"; \ + done + +uninstall-profilesDATA: + @$(NORMAL_UNINSTALL) + @list='$(profiles_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(profilesdir)/$$f'"; \ + rm -f "$(DESTDIR)$(profilesdir)/$$f"; \ + done install-schemasDATA: $(schemas_DATA) @$(NORMAL_INSTALL) test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)" @@ -518,7 +560,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(uidir)"; do \ + for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(profilesdir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(uidir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -542,6 +584,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -568,7 +611,7 @@ install-data-am: install-data-local install-desktopDATA \ install-gladeDATA install-pixmapDATA install-pkgconfigDATA \ - install-schemasDATA install-uiDATA + install-profilesDATA install-schemasDATA install-uiDATA install-exec-am: @@ -596,7 +639,7 @@ uninstall-am: uninstall-desktopDATA uninstall-gladeDATA \ uninstall-info-am uninstall-pixmapDATA uninstall-pkgconfigDATA \ - uninstall-schemasDATA uninstall-uiDATA + uninstall-profilesDATA uninstall-schemasDATA uninstall-uiDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ @@ -604,14 +647,16 @@ install-data install-data-am install-data-local \ install-desktopDATA install-exec install-exec-am \ install-gladeDATA install-info install-info-am install-man \ - install-pixmapDATA install-pkgconfigDATA install-schemasDATA \ - install-strip install-uiDATA installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-desktopDATA \ - uninstall-gladeDATA uninstall-info-am uninstall-pixmapDATA \ - uninstall-pkgconfigDATA uninstall-schemasDATA uninstall-uiDATA + install-pixmapDATA install-pkgconfigDATA install-profilesDATA \ + install-schemasDATA install-strip install-uiDATA installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-desktopDATA uninstall-gladeDATA uninstall-info-am \ + uninstall-pixmapDATA uninstall-pkgconfigDATA \ + uninstall-profilesDATA uninstall-schemasDATA uninstall-uiDATA +@HAVE_GTK_SUPPORT_TRUE@@INTLTOOL_XML_RULE@ @HAVE_GTK_SUPPORT_TRUE@@INTLTOOL_DESKTOP_RULE@ @HAVE_GTK_SUPPORT_TRUE@@INTLTOOL_SCHEMAS_RULE@ diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip.desktop /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip.desktop --- ogmrip-0.11.1/data/ogmrip.desktop 2007-10-21 21:06:59.000000000 +0200 +++ ogmrip-0.12.2/data/ogmrip.desktop 2008-09-21 14:09:53.000000000 +0200 @@ -2,16 +2,16 @@ Encoding=UTF-8 Name=DVD Encoder OGMRip Name[ca]=Codificador de DVD OGMRip +Name[cs]=DVD enkodér OGMRIP Name[de]=OGMRip DVD-Ausleser -Name[es]=Codificador de DVD OGMRip Name[fr]=Encodeur de DVD OGMRip -Name[pl]=Enkoder DVD OGMRip +Name[sv]=Dvd-kodaren OGMRip Comment=A DVD encoder for GNOME Comment[ca]=Un codificador DVD pour GNOME +Comment[cs]=DVD enkodér pro GNOME Comment[de]=Ein DVD-Ausleser für GNOME -Comment[es]=Codificador de DVD para Gnome Comment[fr]=Un encodeur de DVD pour GNOME -Comment[pl]=Enkoder DVD dla GNOME +Comment[sv]=En dvd-kodare för GNOME Exec=ogmrip Icon=ogmrip.png StartupNotify=true diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip.desktop.in /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip.desktop.in --- ogmrip-0.11.1/data/ogmrip.desktop.in 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/data/ogmrip.desktop.in 2008-06-09 21:01:25.000000000 +0200 @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=DVD Encoder OGMRip +_Comment=A DVD encoder for GNOME +Exec=ogmrip +Icon=ogmrip.png +StartupNotify=true +Terminal=false +Type=Application +Categories=GNOME;Application;AudioVideo; diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip-gtk.pc.in /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip-gtk.pc.in --- ogmrip-0.11.1/data/ogmrip-gtk.pc.in 2007-10-07 21:03:55.000000000 +0200 +++ ogmrip-0.12.2/data/ogmrip-gtk.pc.in 2008-06-09 21:01:25.000000000 +0200 @@ -5,7 +5,7 @@ Name: ogmrip-gtk Description: ogmrip-gtk is a collection of widgets for OGMRip. -Requires: ogmdvd-gtk ogmrip +Requires: ogmdvd-gtk ogmrip gconf-2.0 libglade-2.0 Version: @VERSION@ Libs: -L${libdir} -logmrip-gtk Cflags: -I${includedir}/ogmrip diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip-lavc.glade /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip-lavc.glade --- ogmrip-0.11.1/data/ogmrip-lavc.glade 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/data/ogmrip-lavc.glade 2008-06-09 21:01:25.000000000 +0200 @@ -0,0 +1,656 @@ + + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + GTK_WIN_POS_CENTER_ON_PARENT + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 14 + 2 + 6 + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Use comparison function given by mbcmp +Select the MB mode which needs the fewest bits +Select the MB mode which has the best rate distortion + + + 2 + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Strict standard compliance (vstrict) + True + strict-combo + + + 2 + 2 + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Disabled +Mpeg-4 reference decoder +Libavcodec specific extensions +Experimental codecs and features + + + 2 + 3 + 4 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Strategy to choose between I/P/B-frames (vb__strategy) + True + + + 2 + 4 + 5 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Always use the maximum number of B-frames +Avoid B-frames in high motion scenes +Places B-frames more or less optimally to yield maximum quality + + + 2 + 5 + 6 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Quantizer noise shaping (qns) + True + qns-combo + + + 2 + 6 + 7 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Disabled +Only lower the absolute value of coefficients +Only change coefficients before the last non-zero coefficient + 1 +Try all + + + 2 + 7 + 8 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Quantizer _compression (vqcomp) + True + vqcomp-spin + + + 10 + 11 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0.5 0 1 0.10000000000000001 10 10 + 1 + + + 1 + 2 + 10 + 11 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Macroblock decision algorithm (mbd) + True + mbd-combo + + + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Maximum interval between keyframes in frames (keyint) + True + keyint-spin + + + 8 + 9 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 250 0 300 1 10 10 + + + 1 + 2 + 8 + 9 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Amount of motion predictors from the previous frame (last__pred) + True + last_pred-spin + + + 9 + 10 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 0 99 1 10 10 + + + 1 + 2 + 9 + 10 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Intra DC _precision in bits (dc) + True + dc-spin + + + 11 + 12 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 8 1 100 1 10 10 + + + 1 + 2 + 11 + 12 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Try to encode each MB with MV=<0,0> and choose the better one + 0 + True + + + 2 + 12 + 13 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Allow 4 motion vectors per macroblock (v4mv) + 0 + True + + + 2 + 13 + 14 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _General + True + + + tab + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 7 + 2 + 6 + 6 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 -99 6 1 10 10 + + + 1 + 2 + 6 + 7 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Diamond type and size for motion estimation _pre-pass (predia) + True + predia-spin + + + 6 + 7 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 -99 6 1 10 10 + + + 1 + 2 + 5 + 6 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Diamond type and size for motion estimation (dia) + True + dia-spin + + + 5 + 6 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 0 2000 1 10 10 + + + 1 + 2 + 4 + 5 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Comparison function for motion estimation _pre pass (precmp) + True + precmp-spin + + + 4 + 5 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 0 2000 1 10 10 + + + 1 + 2 + 3 + 4 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Comparison function for _sub pel motion estimation (subcmp) + True + subcmp-spin + + + 3 + 4 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 0 2000 1 10 10 + + + 1 + 2 + 2 + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Comparison function for full pel motion estimation (cmp) + True + cmp-spin + + + 2 + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Disabled +Only after I-frames +Always + + + 2 + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Motion _estimation pre-pass (preme) + True + preme-combo + + + 2 + + + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Motion _Estimation + True + + + tab + 1 + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 3 + 2 + 6 + 6 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 0 100000 1 10 10 + + + 1 + 2 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 0 100000 1 10 10 + + + 1 + 2 + 1 + 2 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 0 100000 1 10 10 + + + 1 + 2 + 2 + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Buffer size in kbit (vrc__buf__size) + True + buf_size-spin + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + M_aximum bitrate in kbit/sec (vrc__maxrate) + True + max_rate-spin + + + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + M_inimum bitrate in kbit/sec (vrc__minrate) + True + min_rate-spin + + + 2 + 3 + + + + + + + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Rate Control + True + + + tab + 2 + False + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_BUTTONBOX_END + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-close + True + 0 + + + + + False + GTK_PACK_END + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip-main.glade /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip-main.glade --- ogmrip-0.11.1/data/ogmrip-main.glade 2007-10-07 21:03:55.000000000 +0200 +++ ogmrip-0.12.2/data/ogmrip-main.glade 2008-06-09 21:01:25.000000000 +0200 @@ -1,572 +1,396 @@ - - - + + + - - - OGMRip - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 350 - 450 - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - True - - - 0 - False - False - GTK_PACK_END - - - - - - 6 - True - False - 6 - - - - True - 5 - 3 - False - 6 - 6 - - - - True - <b>_Title:</b> - True - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - title-entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - <b>_Video Stream:</b> - True - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - <b>_Audio Tracks:</b> - True - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - <b>_Subtitles:</b> - True - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - <b>Duration:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - - True - False - True - True - True - 0 - - True - * - False - - - 1 - 3 - 0 - 1 - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 4 - 5 - - - - - - - True - False - True - _Relative mode - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 2 - 3 - 4 - 5 - fill - - - - - - - True - ogmdvd_title_chooser_widget_new - 0 - 0 - Fri, 24 Feb 2006 19:20:31 GMT - - - 1 - 3 - 1 - 2 - fill - fill - - - - - 0 - False - False - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - + + OGMRip + 350 + 450 + + + True + + True - ogmrip_chapter_list_new - 0 - 0 - Sat, 25 Feb 2006 15:51:00 GMT + 6 + 6 + + + True + 5 + 3 + 6 + 6 + + + + + + + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + ogmdvd_title_chooser_widget_new + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Angle: + + + False + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 1 100 1 10 10 + + + False + 1 + + + + + False + 1 + + + + + 1 + 3 + 1 + 2 + + + + + True + 0 + <b>_Title:</b> + True + True + title-entry + + + GTK_FILL + + + + + + True + 0 + <b>_Video Stream:</b> + True + True + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + 0 + <b>_Audio Tracks:</b> + True + True + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + <b>_Subtitles:</b> + True + True + + + 3 + 4 + GTK_FILL + + + + + + True + 0 + <b>Duration:</b> + True + + + 4 + 5 + GTK_FILL + + + + + + True + False + True + + + 1 + 3 + + + + + + True + False + True + _Relative mode + True + 0 + True + + + 2 + 3 + 4 + 5 + GTK_FILL + + + + + + True + 0 + + + 1 + 2 + 4 + 5 + + + + + + False + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + ogmrip_chapter_list_new + + + + + 1 + + + + + True + 6 + GTK_BUTTONBOX_END + + + True + True + True + Load a DVD disk + 0 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-cdrom + + + False + False + + + + + True + _Load + True + + + False + False + 1 + + + + + + + + + + + True + True + True + Open a DVD structure + 0 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-open + + + False + False + + + + + True + _Open + True + + + False + False + 1 + + + + + + + + + 1 + + + + + True + False + True + True + Extract selected streams + 0 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-convert + + + False + False + + + + + True + E_xtract + True + + + False + False + 1 + + + + + + + + + 2 + + + + + False + False + 2 + + - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 6 - - - - True - Load a DVD disk - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-cdrom - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Load - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - True - Open a DVD structure - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-open - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Open - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - True - False - Extract selected streams - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-convert - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - E_xtract - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - 0 - False - False - - - - - 0 - True - True - GTK_PACK_END - - - - - - + + + + True + + + False + False + 1 + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip-options.glade /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip-options.glade --- ogmrip-0.11.1/data/ogmrip-options.glade 2007-10-07 21:03:55.000000000 +0200 +++ ogmrip-0.12.2/data/ogmrip-options.glade 2008-07-27 13:39:02.000000000 +0200 @@ -4,7 +4,6 @@ Options - True 300 GDK_WINDOW_TYPE_HINT_DIALOG @@ -13,270 +12,114 @@ True - 6 + 5 6 - + True - 6 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Profile: + True + profile-combo + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True - Sets the bitrate to be used in kbits/second. + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 - + True - 0 - <b>Bitrate</b> - True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - False - - - - - True - 12 - + True - 6 - - - True - True - Setting a video bitrate will prevent the output files to be of the desired size - _Automatic - True - 0 - True - True - - - False - False - - + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Edit profiles + 0 - + True - False - 3 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 - + True - 6 - - - True - Video _Bitrate (kbps): - True - bitrate-spin - - - False - False - - - - - True - True - 800 4 16000 1 10 10 - 1 - - - 1 - - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-edit - - 1 - + + False + 1 + - - 1 - False - False + 1 - + True - 6 - - - True - Crops the given part of the image and discards the rest. Useful to remove black bands from widescreen movies. - - - True - 0 - <b>Cropping</b> - True - - - - - False - False - - + True + Automatic _scaling + True + 0 + True + True + + + False + 2 + + + + + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 - + True - 12 + 6 - + True + 6 - + True - True - _Automatic - True - 0 - True - True - - False - False - - + True False - 6 - - - True - 0 - - - True - True - _Crop - True - 0 - - - - - - - True - 3 - 3 - 3 - - - True - 0 - - - 3 - GTK_FILL - - - - - - True - 0 - - - 3 - 2 - 3 - GTK_FILL - - - - - - True - 0 - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - 0 - <b>┌──┐ -└──┘</b> - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - False - 6 - 1 - - - - - True - 0 - - - True - True - Auto_detect - True - 0 - - - - - False - False - 2 - - + True + The scaling parameters can only be autodetected if a video bitrate and cropping parameters are set. + Auto_detect + True + 0 False @@ -286,57 +129,17 @@ - - - 1 - - - - - False - False - 1 - - - - - True - 6 - - - True - Scales the image with the software scaler and performs a YUV<->RGB colorspace conversion. - - - True - 0 - <b>Scaling</b> - True - - - - - False - False - - - - - True - 12 - + True + False 6 - + True - True - _Automatic + _Width: True - 0 - True - True + scale-width-spin False @@ -344,195 +147,108 @@ - + True - 6 - - - True - Bits per pixel: - - - False - False - - - - - True - True - 0.25 0.0099999997764800008 1 0.0099999997764800008 10 10 - 1 - 2 - - - 1 - - + True + 2 0 10000 1 10 10 + 1 1 - + True - False - 6 - - - True - 6 - - - True - - - - - True - False - True - The scaling parameters can only be autodetected if a video bitrate and cropping parameters are set. - Auto_detect - True - 0 - - - False - False - 1 - - - - - - - True - False - 6 - - - True - _Width: - True - scale-width-spin - - - False - False - - - - - True - True - 2 0 10000 1 10 10 - 1 - - - 1 - - - - - True - _Height: - True - scale-height-spin - - - False - False - 2 - - - - - True - True - 2 2 10000 2 10 10 - 1 - - - 3 - - - - - 1 - - + _Height: + True + scale-height-spin + False + False 2 + + + True + True + 2 2 10000 2 10 10 + 1 + + + 3 + + + + 1 + - - 1 - False - False - 2 + 3 - + True - 6 - - - True - 0 - <b>NTSC</b> - True - - - False - False - - + True + Automatic _cropping + True + 0 + True + True + + + False + 4 + + + + + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 - + True - 12 + 6 - + True - 2 - 2 - 6 - 6 + 0 - + True True - Inverse _telecine + _Crop True 0 - True - - 2 - - + + + + + True + 3 + 3 + 3 - + True - True - _Progressive - True - 0 - True + 0 + <b>┌──┐ +└──┘</b> + True + 1 2 1 2 @@ -540,75 +256,39 @@ - - - - - 1 - - - - - False - False - 3 - - - - - True - True - 3 - True - 3 - - - True - 12 - - - True - 3 - 2 - 6 - 6 - + True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Cartoon - True - 0 - True + 0 - 2 + 2 + 3 + 1 + 2 + GTK_FILL + - + True - None -Decimate by 2 -Decimate by 3 + 0 - 1 - 2 - 2 - 3 - GTK_FILL + 1 + 2 + GTK_FILL + - + True - 0 - _Frame drop: - True + 0 + 3 2 3 GTK_FILL @@ -616,75 +296,123 @@ - + True - 0 - _Deinterlacer: - True + 0 - 1 - 2 + 3 GTK_FILL + + + False + 6 + 1 + + + + + True + 0 - + True - None -Linear Blend -Linear Interpolating -Cubic Interpolating -Median -Ffmpeg -FIR Lowpass -Kernel -Yadif (Best) + True + Auto_detect + True + 0 - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - + + False + False + 2 + - - - True - <b>More Options</b> - True - - - label_item - - False - False - 4 + 5 - + True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Compressibility Test + _Cartoon + True 0 + True False - False - 5 + 6 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Deinterlace + True + 0 + True + + + False + 7 + + + + + True + 2 + 2 + 6 + 6 + + + True + True + Inverse _telecine + True + 0 + True + + + 2 + + + + + + True + True + _Progressive + True + 0 + True + + + 2 + 1 + 2 + GTK_FILL + + + + + + False + 8 diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip.pc.in /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip.pc.in --- ogmrip-0.11.1/data/ogmrip.pc.in 2007-10-07 21:03:55.000000000 +0200 +++ ogmrip-0.12.2/data/ogmrip.pc.in 2008-06-09 21:01:25.000000000 +0200 @@ -7,6 +7,6 @@ Description: ogmrip is a library for ripping and encoding DVD. Requires: ogmjob ogmdvd enca gmodule-2.0 Version: @VERSION@ -Libs: -L${libdir} -logmrip +Libs: -L${libdir} -logmrip -logmrip-mplayer -logmrip-lavc Cflags: -I${includedir}/ogmrip diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip-pref.glade /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip-pref.glade --- ogmrip-0.11.1/data/ogmrip-pref.glade 2007-10-07 21:03:55.000000000 +0200 +++ ogmrip-0.12.2/data/ogmrip-pref.glade 2008-06-09 21:01:25.000000000 +0200 @@ -10,15 +10,15 @@ True - + True True - 6 + 5 True - 6 - 12 + 12 + 18 True @@ -42,7 +42,7 @@ True - 3 + 2 2 6 6 @@ -57,19 +57,6 @@ 1 2 - 2 - 3 - - - - - - True - Select the temporary directory - - - 1 - 2 1 2 @@ -90,22 +77,9 @@ True 0 - _Temporary Path: - True - - - 1 - 2 - GTK_FILL - - - - - - True - 0 _Output Path: True + output-dir-chooser GTK_FILL @@ -121,8 +95,8 @@ filename-combo - 2 - 3 + 1 + 2 GTK_FILL @@ -143,223 +117,106 @@ True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - <b>Targets</b> + <b>Preferred Languages</b> True - - False - False - True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 True - 4 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 2 6 6 - - True - True - 800 1 10000 1 10 10 - 1 - True - - - 1 - 2 - 3 - 4 - - - - - - True - True - 1 1 100 1 10 10 - 1 - True - - - 1 - 2 - 2 - 3 - - - - - + True - Automatic -XviD -DivX 4 -Divx 5 -FFMpeg + No preferred audio language 1 2 - 1 - 2 - - - - - - True - - - 1 - 2 - - - - - - True - 0 - _FourCC: - True - - - 1 - 2 - GTK_FILL - True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - _Container: + _Audio: True - container-combo + pref-audio-combo GTK_FILL - True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Si_ze of Targets: + _Subtitles: True - tsize-spin + pref-subp-combo - 3 - 4 + 1 + 2 GTK_FILL - True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - _Number of Targets: + _Chapters: True - tnumber-spin + chapter-lang-combo 2 3 GTK_FILL - - - - - - 1 - - - - - False - False - 1 - - - - - True - 6 - - - True - 0 - <b>Misc</b> - True - - - False - False - - - - - True - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 2 - 6 - 6 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - No chapters language + No preferred subtitle language 1 2 + 1 + 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Chapter language: - - - GTK_FILL - - - - - - True - True - Ensure A/V synchronisation - True - True - True + No chapters language + 1 2 - 1 - 2 + 2 + 3 @@ -373,13 +230,10 @@ False False - 2 + 1 - - False - @@ -389,24 +243,26 @@ tab - False False - + True - 6 - 12 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + 18 True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - <b>Codec</b> + <b>DVD Copy</b> True @@ -417,20 +273,48 @@ True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True - False - 1 - 2 - 6 - 6 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + True + _Copy DVD on hard drive before encoding + True + 0 + True + + - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _After the encoding: + True + after-enc-combo + + + 1 + - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Remove the copy +Keep the copy on the hard drive +Keep the copy and update the GUI +Ask the user + + + 2 + @@ -453,7 +337,7 @@ True 0 - <b>Options</b> + <b>Misc</b> True @@ -468,259 +352,63 @@ True - 10 - 4 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + 2 6 6 - + True - True - 1 1 100 1 10 10 - 1 - True + Select the temporary directory 1 - 4 - 3 - 4 + 2 - + True - Fast Bilinear -Bilinear -Bicubic -Experimental -Nearest Neighbour -Area -Luma Bicubic Chroma Bilinear -Gauss (best for downscaling) -SincR -Lanczos (best for upscaling) -Bicubic Spline + 0 + _Temporary Path: + True + tmp-dir-chooser - 1 - 4 - 2 - 3 + GTK_FILL - + True - Very High -High -Fast + True + Do _not remove temporary files + True + 0 + True - 1 - 4 + 2 1 2 - - + True True - 1 1 100 1 10 10 - 1 - True - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - 1 Audio + + _Log commands output + True + 0 + True - 1 2 - GTK_FILL - - - - - - True - True - Use a deringing filter - True - True - - - 4 - 8 - 9 - GTK_FILL - - - - - - True - True - Use a deblocking filter - True - True - - - 4 - 7 - 8 - GTK_FILL - - - - - - True - 0 - Threads: - - - 3 - 4 - GTK_FILL - - - - - - True - 0 - Video - - - 3 - 4 - - - - - - True - 0 - _Passes: - True - - - GTK_FILL - - - - - - True - True - Dramatically speeds up pass one using faster algorithms and disabling CPU-intensive options. This will probably reduce global PSNR a little bit (around 0.01dB) and change individual frame type and PSNR little bit more (up to 0.03dB). - T_urbo - True - True - True - - - 4 - 9 - 10 - GTK_FILL - - - - - - True - True - MPEG-4 uses a half pixel precision for its motion search by default. The standard proposes a mode where encoders are allowed to use quarter pixel precision. This option usually results in a sharper image. Unfortunately it has a great impact on bitrate and sometimes the higher bitrate use will prevent it from giving a better image quality at a fixed bitrate. It's better to test with and without this option and see whether it is worth activating. - Use _quarter pel motion compensation - True - True - - - 4 - 6 - 7 - GTK_FILL - - - - - - True - True - Trellis quantization is a kind of adaptive quantization method that saves bits by modifying quantized coefficients to make them more compressible by the entropy encoder. Its impact on quality is good. - T_rellis searched quantization - True - True - True - - - 4 - 5 - 6 - GTK_FILL - - - - - - True - True - This filter aims to reduce image noise producing smooth images and making still images really still (This should enhance compressibility.). - Reduce image _noise - True - True - True - - - 4 - 4 - 5 - GTK_FILL - - - - - - True - 0 - _Quality: - True - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - S_caler: - True - scaler-combo - - - 2 - 3 - GTK_FILL - + 2 + 3 @@ -740,697 +428,17 @@ 1 - False True - _Video + _Advanced True tab 1 - False - False - - - - - True - 6 - 12 - - - True - 6 - - - True - 0 - <b>Codec</b> - True - - - False - False - - - - - True - 12 - - - True - False - 1 - 2 - 6 - 6 - - - - - - - - - - - 1 - - - - - False - False - - - - - True - 6 - - - True - 0 - <b>Options</b> - True - - - False - False - - - - - True - 12 - - - True - 4 - 2 - 6 - 6 - - - True - Mono -Stereo -Surround -5.1 - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - 0 - _Channels: - True - - - 1 - 2 - GTK_FILL - - - - - - True - 48000 Hz -44100 Hz -32000 Hz -24000 Hz -22050 Hz -16000 Hz -12000 Hz -11025 Hz -8000 Hz - - - 1 - 2 - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - 0 - Sample _Rate: - True - srate-combo - - - 2 - 3 - GTK_FILL - - - - - - True - True - 3 0 10 1 10 10 - 1 - True - - - 1 - 2 - - - - - - True - True - Maximizes the volume without distorting the sound. - _Normalize - True - True - True - - - 2 - 3 - 4 - GTK_FILL - - - - - - True - 0 - _Quality: - True - quality-spin - - - GTK_FILL - - - - - - - - 1 - - - - - False - False - 1 - - - - - True - 6 - - - True - 0 - <b>Preferred _Language</b> - True - True - pref-audio-combo - - - False - False - - - - - True - 12 - - - True - No preferred audio language - - - - - 1 - - - - - False - False - 2 - - - - - 2 - False - - - - - True - _Audio - True - - - tab - 2 - False - False - - - - - True - 6 - 12 - - - True - 6 - - - True - 0 - <b>Codec</b> - True - - - False - False - - - - - True - 12 - - - True - False - 1 - 2 - 6 - 6 - - - - - - - - - - - 1 - - - - - False - False - - - - - True - 6 - - - True - 0 - <b>Text Options</b> - True - - - False - False - - - - - True - 12 - - - True - 4 - 2 - 6 - 6 - - - True - UTF-8 -ISO-8859-1 -ASCII - - - 1 - 2 - - - - - - True - Carriage return only (Unix) -Carriage return + Line feed (DOS) - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - True - True - Spell _Checking - True - True - - - 2 - 3 - 4 - GTK_FILL - - - - - - True - 0 - End of _line: - True - eol-combo - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - _Character Set: - True - charset-combo - - - GTK_FILL - - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Forced subtitles only - True - True - - - 2 - 2 - 3 - - - - - - - 1 - - - - - False - False - 1 - - - - - True - 6 - - - True - 0 - <b>Preferred _Language</b> - True - True - pref-subp-combo - - - False - False - - - - - True - 12 - - - True - No preferred subtitle language - - - - - 1 - - - - - False - False - 2 - - - - - 3 - False - - - - - True - _Subtitles - True - - - tab - 3 - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>DVD Copy</b> - True - - - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 2 - 6 - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Remove the copy -Keep the copy on the hard drive -Keep the copy and update the GUI -Ask the user - - - 1 - 2 - 1 - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _After the encoding: - True - - - 1 - 2 - - - - - - - True - True - _Copy DVD on hard drive before encoding - True - True - - - 2 - - - - - - - 1 - - - - - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Debug</b> - True - - - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - - - True - True - Do _not remove temporary files - True - True - - - - - True - True - _Log commands output - True - True - - - 1 - - - - - - - 1 - - - - - False - False - 1 - - - - - 4 - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Advanced - - - tab - 4 - False False diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip-profile-editor.glade /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip-profile-editor.glade --- ogmrip-0.11.1/data/ogmrip-profile-editor.glade 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/data/ogmrip-profile-editor.glade 2008-06-09 21:01:25.000000000 +0200 @@ -0,0 +1,1319 @@ + + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + Profile + GTK_WIN_POS_CENTER_ON_PARENT + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 12 + + + True + 6 + + + True + 0 + <b>Container</b> + True + + + False + False + + + + + True + 12 + + + True + 3 + 3 + 6 + 6 + + + True + True + Ensure A/V _synchronisation + True + 0 + True + True + + + 3 + 2 + 3 + + + + + True + 0 + _Format: + True + container-combo + + + GTK_FILL + + + + + + True + 0 + Four_CC: + True + fourcc-combo + + + 1 + 2 + GTK_FILL + + + + + + True + + + 1 + 2 + + + + + + True + Automatic +XviD +DivX 4 +Divx 5 +FFMpeg + + + 1 + 3 + 1 + 2 + + + + + + True + False + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Options + True + 0 + + + 2 + 3 + GTK_FILL + + + + + + + 1 + + + + + False + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Encoding</b> + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 4 + 2 + 6 + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Bitrate: + True + bitrate-spin + + + 2 + 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Quantizer: + True + quantizer-spin + + + 3 + 4 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 1 31 1 10 10 + + + 1 + 2 + 3 + 4 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Method: + True + encoding-combo + + + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Fixed size +Constant bitrate +Constant quantizer + + + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Size: + True + tnumber-spin + + + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 800 4 16000 1 10 10 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + kbps + + + False + 1 + + + + + 1 + 2 + 2 + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 1 100 1 10 10 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + x + + + False + 1 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 700 1 10000 1 10 10 + + + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + MB + + + False + 3 + + + + + 1 + 2 + 1 + 2 + + + + + + + 1 + + + + + False + False + 1 + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _General + True + + + tab + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Codec</b> + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 + 2 + 6 + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Codec: + True + video-codec-combo + + + GTK_FILL + + + + + + + 1 + + + + + False + False + + + + + True + 6 + + + True + 0 + <b>Options</b> + True + + + False + False + + + + + True + 12 + + + True + 10 + 3 + 6 + 6 + + + True + Extreme +High +Normal + + + 1 + 2 + 1 + 2 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Quality: + True + preset-combo + + + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Passes: + True + passes-spin + + + GTK_FILL + + + + + True + 0 + S_caler: + True + scaler-combo + + + 2 + 3 + GTK_FILL + + + + + + True + True + This filter aims to reduce image noise producing smooth images and making still images really still (This should enhance compressibility.). + Reduce image _noise + True + 0 + True + True + + + 3 + 4 + 5 + GTK_FILL + + + + + + True + True + Trellis quantization is a kind of adaptive quantization method that saves bits by modifying quantized coefficients to make them more compressible by the entropy encoder. Its impact on quality is good. + T_rellis searched quantization + True + 0 + True + True + + + 3 + 5 + 6 + GTK_FILL + + + + + + True + True + MPEG-4 uses a half pixel precision for its motion search by default. The standard proposes a mode where encoders are allowed to use quarter pixel precision. This option usually results in a sharper image. Unfortunately it has a great impact on bitrate and sometimes the higher bitrate use will prevent it from giving a better image quality at a fixed bitrate. It's better to test with and without this option and see whether it is worth activating. + Use _quarter pel motion compensation + True + 0 + True + + + 3 + 6 + 7 + GTK_FILL + + + + + + True + True + Dramatically speeds up pass one using faster algorithms and disabling CPU-intensive options. This will probably reduce global PSNR a little bit (around 0.01dB) and change individual frame type and PSNR little bit more (up to 0.03dB). + T_urbo + True + 0 + True + True + + + 3 + 9 + 10 + GTK_FILL + + + + + + True + 0 + _Threads: + True + threads-spin + + + 3 + 4 + GTK_FILL + + + + + + True + True + Use a deblocking filter + True + 0 + True + + + 3 + 7 + 8 + GTK_FILL + + + + + + True + True + Use a deringing filter + True + 0 + True + + + 3 + 8 + 9 + GTK_FILL + + + + + + True + Fast Bilinear +Bilinear +Bicubic +Experimental +Nearest Neighbour +Area +Luma Bicubic Chroma Bilinear +Gauss (best for downscaling) +SincR +Lanczos (best for upscaling) +Bicubic Spline + + + 1 + 3 + 2 + 3 + + + + + + True + True + 1 1 100 1 10 10 + 1 + True + + + 1 + 3 + 3 + 4 + + + + + + True + False + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Editer + True + 0 + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 audio + + + + False + + + + + True + True + 1 1 100 1 10 10 + 1 + True + + + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + video + + + 2 + + + + + 1 + 3 + + + + + + + 1 + + + + + False + False + 1 + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Video + True + + + tab + 1 + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Codec</b> + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 + 3 + 6 + 6 + + + True + False + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Options + True + 0 + + + 2 + 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Codec: + True + audio-codec-combo + + + GTK_FILL + + + + + + + 1 + + + + + False + False + + + + + True + 6 + + + True + 0 + <b>Options</b> + True + + + False + False + + + + + True + 12 + + + True + 4 + 2 + 6 + 6 + + + True + Mono +Stereo +Surround +5.1 + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Channels: + True + channels-combo + + + 1 + 2 + GTK_FILL + + + + + True + True + 3 0 10 1 10 10 + 1 + True + + + 1 + 2 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Quality: + True + quality-spin + + + GTK_FILL + + + + + True + 48000 Hz +44100 Hz +32000 Hz +24000 Hz +22050 Hz +16000 Hz +12000 Hz +11025 Hz +8000 Hz + + + 1 + 2 + 2 + 3 + + + + + True + 0 + Sample _Rate: + True + srate-combo + + + 2 + 3 + GTK_FILL + + + + + + True + True + Maximizes the volume without distorting the sound. + _Normalize + True + 0 + True + True + + + 2 + 3 + 4 + GTK_FILL + + + + + + + + 1 + + + + + False + False + 1 + + + + + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Audio + True + + + tab + 2 + False + + + + + 0 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Codec</b> + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 3 + 6 + 6 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Forced subtitles only + True + 0 + True + + + 3 + 1 + 2 + + + + + True + False + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Options + True + 0 + + + 2 + 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Codec: + True + subp-codec-combo + + + GTK_FILL + + + + + + + 1 + + + + + False + False + + + + + True + 6 + + + True + 0 + <b>Text Options</b> + True + + + False + False + + + + + True + 12 + + + True + 3 + 2 + 6 + 6 + + + True + True + Spell _Checking + True + 0 + True + + + 2 + 2 + 3 + GTK_FILL + + + + + + True + UTF-8 +ISO-8859-1 +ASCII + + + 1 + 2 + + + + + + True + Carriage return only (Unix) +Carriage return + Line feed (DOS) + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + 0 + End of _line: + True + eol-combo + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + _Character Set: + True + charset-combo + + + GTK_FILL + + + + + + + + 1 + + + + + False + False + 1 + + + + + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Subtitles + True + + + tab + 3 + False + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_BUTTONBOX_END + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-close + True + 0 + + + + + False + GTK_PACK_END + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip-profiles.glade /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip-profiles.glade --- ogmrip-0.11.1/data/ogmrip-profiles.glade 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/data/ogmrip-profiles.glade 2008-06-15 17:10:28.000000000 +0200 @@ -0,0 +1,293 @@ + + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + GTK_WIN_POS_CENTER_ON_PARENT + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Profiles: + True + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + GTK_BUTTONBOX_START + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-new + True + 0 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-edit + True + 0 + + + 1 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-delete + True + 0 + + + 2 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-copy + True + 0 + + + 3 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-refresh + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Rename + True + rename-button + + + 1 + + + + + + + + + 4 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-open + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Import + True + import-button + + + 1 + + + + + + + + + 5 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-save + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Export + True + export-button + + + 1 + + + + + + + + + 6 + + + + + False + 1 + + + + + 1 + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_BUTTONBOX_END + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-close + True + 0 + + + + + False + GTK_PACK_END + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip-progress.glade /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip-progress.glade --- ogmrip-0.11.1/data/ogmrip-progress.glade 2007-10-07 21:03:55.000000000 +0200 +++ ogmrip-0.12.2/data/ogmrip-progress.glade 2008-06-09 21:01:25.000000000 +0200 @@ -1,307 +1,174 @@ - - - + + + - - - Progress - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - True - 400 - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - False - 6 - - - - True - Title - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - <b>Stage</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.10000000149 - PANGO_ELLIPSIZE_NONE - - - 0 - False - False - - - - - - True - False - 6 - - - - True - Estimated time left: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Unknown - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 6 - - - - True - <b>Encoding Progress</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.10000000149 - PANGO_ELLIPSIZE_NONE - - - - - 0 - True - True - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - + + Progress + True + 400 + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + 0 + <big><b>Title</b></big> + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-cdrom + 6 + + + False + False + 1 + + + + + False + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 18 + + + True + 6 + + + True + 0 + <i>Stage</i> + True + + + False + False + + + + + True + True + 0.10000000149 + + + False + False + 1 + + + + + True + 6 + + + True + Estimated time left: + + + False + False + + + + + True + 0 + Unknown + + + 1 + + + + + False + 2 + + + + + False + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Close the application if the encoding is successful + True + 0 + True + + + False + False + 1 + + + + + 1 + + + + + + + 1 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + False + GTK_PACK_END + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip.schemas /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip.schemas --- ogmrip-0.11.1/data/ogmrip.schemas 2007-10-21 21:06:59.000000000 +0200 +++ ogmrip-0.12.2/data/ogmrip.schemas 2008-09-21 14:09:54.000000000 +0200 @@ -6,24 +6,24 @@ - /schemas/apps/ogmrip/general/output_dir - /apps/ogmrip/general/output_dir + /schemas/apps/ogmrip/general/profile + /apps/ogmrip/general/profile string ogmrip + default-ogm - - The directory to save the extracted movie to + The current profile - /schemas/apps/ogmrip/general/tmp_dir - /apps/ogmrip/general/tmp_dir + /schemas/apps/ogmrip/general/output_dir + /apps/ogmrip/general/output_dir string ogmrip - - The directory to save the temporary files to + + The directory to save the extracted movie to @@ -45,307 +45,8 @@ - /schemas/apps/ogmrip/general/container - /apps/ogmrip/general/container - string - ogmrip - ogm - - The container - - - - - /schemas/apps/ogmrip/general/fourcc - /apps/ogmrip/general/fourcc - int - ogmrip - 0 - - The fourcc of the output file - - 0 -- Automatic - 1 -- XviD - 2 -- DivX 4 - 3 -- DivX 5 - 4 -- FFMpeg - - - - - - /schemas/apps/ogmrip/target_number - /apps/ogmrip/target_number - int - ogmrip - 1 - - The number of file to split the movie into - - - - - /schemas/apps/ogmrip/target_size - /apps/ogmrip/target_size - int - ogmrip - 700 - - The size of each target in MB - - - - - /schemas/apps/ogmrip/chapter_lang - /apps/ogmrip/chapter_lang - int - ogmrip - 0 - - The chapter language - - 0 -- Current locale - n -- Language code - - - - - - /schemas/apps/ogmrip/general/ensure_sync - /apps/ogmrip/general/ensure_sync - bool - ogmrip - true - - Ensure A/V sync - - - - - - - /schemas/apps/ogmrip/video/codec - /apps/ogmrip/video/codec - string - ogmrip - lavc - - The video codec - - - - - /schemas/apps/ogmrip/video/passes - /apps/ogmrip/video/passes - int - ogmrip - 1 - - The number of pass for the encoding of the video stream - - n -- 1 Audio + n Video - - - - - - /schemas/apps/ogmrip/video/quality - /apps/ogmrip/video/quality - int - ogmrip - 3 - - The quality to use for the encoding of the video stream - - 0 -- Very High - 1 -- High - 2 -- Fast - - - - - - /schemas/apps/ogmrip/video/scaler - /apps/ogmrip/video/scaler - int - ogmrip - 7 - - The software scaler to use when resizing the video - - 0 -- Fast Bilinear - 1 -- Bilinear - 2 -- Bicubic - 3 -- Experimental - 4 -- Nearest Neighbour - 5 -- Area - 6 -- Luma Bicubic Chroma Bilinear - 7 -- Gauss (best for downscaling) - 8 -- SincR - 9 -- Lanczos (best for upscaling) - 10 -- Bicubic Spline - - - - - - /schemas/apps/ogmrip/video/threads - /apps/ogmrip/video/threads - int - ogmrip - 1 - - The number of threads when encoding the video stream - - - - - /schemas/apps/ogmrip/video/denoise - /apps/ogmrip/video/denoise - bool - ogmrip - true - - If the video must be denoised - - - - - /schemas/apps/ogmrip/video/trellis - /apps/ogmrip/video/trellis - bool - ogmrip - true - - If use trellis searched quantization - - - - - /schemas/apps/ogmrip/video/qpel - /apps/ogmrip/video/qpel - bool - ogmrip - false - - If use quarter pel motion compensation - - - - - /schemas/apps/ogmrip/video/deblock - /apps/ogmrip/video/deblock - bool - ogmrip - false - - If a deblocking filter must be applied - - - - - /schemas/apps/ogmrip/video/dering - /apps/ogmrip/video/dering - bool - ogmrip - false - - If a deringing filter must be applied - - - - - /schemas/apps/ogmrip/video/turbo - /apps/ogmrip/video/turbo - bool - ogmrip - true - - If use turbo - - - - - - - /schemas/apps/ogmrip/audio/codec - /apps/ogmrip/audio/codec - string - ogmrip - vorbis - - The audio codec - - - - - /schemas/apps/ogmrip/audio/quality - /apps/ogmrip/audio/quality - int - ogmrip - 3 - - The quality to use when encoding the audio tracks - - 0 -- Poor - 10 -- Best - - - - - - /schemas/apps/ogmrip/audio/channels - /apps/ogmrip/audio/channels - int - ogmrip - 0 - - The number of channels to use when compressing the audio tracks - - 0 -- Mono - 1 -- Stereo - 2 -- Surround - 3 -- 5.1 - - - - - - /schemas/apps/ogmrip/audio/srate - /apps/ogmrip/audio/srate - int - ogmrip - 0 - - The sample rate to use when encoding the audio tracks - - 0 -- 48000 Hz - 1 -- 44100 Hz - 2 -- 32000 Hz - 3 -- 24000 Hz - 4 -- 22050 Hz - 5 -- 16000 Hz - 6 -- 12000 Hz - 7 -- 11025 Hz - 8 -- 8000 Hz - - - - - - /schemas/apps/ogmrip/audio/normalize - /apps/ogmrip/audio/normalize - bool - ogmrip - true - - If the volume of the audio tracks must be normalized - - - - - /schemas/apps/ogmrip/audio/pref - /apps/ogmrip/audio/pref + /schemas/apps/ogmrip/general/pref_audio + /apps/ogmrip/general/pref_audio int ogmrip 0 @@ -358,84 +59,44 @@ - - - /schemas/apps/ogmrip/subp/codec - /apps/ogmrip/subp/codec - string - ogmrip - vobsub - - The subp codec - - - - - /schemas/apps/ogmrip/subp/charset - /apps/ogmrip/subp/charset + /schemas/apps/ogmrip/general/pref_subp + /apps/ogmrip/general/pref_subp int ogmrip 0 - The character set of text subtitles + The preferred language of the subtitles - 0 -- UTF8 - 1 -- ISO-8859-1 - 2 -- ASCII + 0 -- None + n -- Language code - /schemas/apps/ogmrip/subp/eol - /apps/ogmrip/subp/eol + /schemas/apps/ogmrip/general/chapter_lang + /apps/ogmrip/general/chapter_lang int ogmrip 0 - The end of line style of text subtitles + The chapter language - 0 -- Carriage Return (Unix) - 1 -- Carriage Return + Line Feed (DOS) + 0 -- Current locale + n -- Language code - /schemas/apps/ogmrip/subp/forced - /apps/ogmrip/subp/forced + /schemas/apps/ogmrip/general/expert + /apps/ogmrip/general/expert bool ogmrip false - If only forced subtitles must be extracted - - - - - /schemas/apps/ogmrip/subp/spell_check - /apps/ogmrip/subp/spell_check - bool - ogmrip - false - - If the spell of the text subtitles must be checked - - - - - /schemas/apps/ogmrip/subp/pref - /apps/ogmrip/subp/pref - int - ogmrip - 0 - - The preferred language of the subtitles - - 0 -- None - n -- Language code - + Expert mode @@ -446,7 +107,7 @@ /apps/ogmrip/advanced/copy_dvd bool ogmrip - false + true If copy DVD on hd before encoding @@ -470,6 +131,17 @@ + /schemas/apps/ogmrip/general/tmp_dir + /apps/ogmrip/general/tmp_dir + string + ogmrip + + + The directory to save the temporary files to + + + + /schemas/apps/ogmrip/advanced/keep_tmp /apps/ogmrip/advanced/keep_tmp bool diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip-simple-editor.glade /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip-simple-editor.glade --- ogmrip-0.11.1/data/ogmrip-simple-editor.glade 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/data/ogmrip-simple-editor.glade 2008-06-09 21:01:25.000000000 +0200 @@ -0,0 +1,635 @@ + + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + GTK_WIN_POS_CENTER_ON_PARENT + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Encoding</b> + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + 2 + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 800 4 16000 1 10 10 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + kbps + + + False + 1 + + + + + 1 + 2 + 3 + 4 + + + + + True + + + 1 + 2 + + + + + True + 0 + _Format: + True + container-combo + + + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Method: + True + encoding-combo + + + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Fixed size +Constant bitrate +Constant quantizer + + + 1 + 2 + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Size: + True + tnumber-spin + + + 2 + 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 1 100 1 10 10 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + x + + + False + 1 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 700 1 10000 1 10 10 + + + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + MB + + + False + 3 + + + + + 1 + 2 + 2 + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Bitrate: + True + bitrate-spin + + + 3 + 4 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Quantizer: + True + quantizer-spin + + + 4 + 5 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 1 31 1 10 10 + + + 1 + 2 + 4 + 5 + + + + + + + 1 + + + + + False + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Video</b> + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + 4 + 6 + 6 + + + True + True + 1 1 100 1 10 10 + 1 + True + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + video + + + 3 + 4 + 2 + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 audio + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Passes: + True + passes-spin + + + 2 + 3 + GTK_FILL + + + + + True + Extreme +High +Normal + + + 1 + 4 + 1 + 2 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Quality: + True + preset-combo + + + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Codec: + True + video-codec-combo + + + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 4 + + + + + + + 1 + + + + + False + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Audio</b> + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 2 + 6 + 6 + + + True + True + 3 0 10 1 10 10 + 1 + True + + + 1 + 2 + 1 + 2 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Quality: + True + quality-spin + + + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Codec: + True + audio-codec-combo + + + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + + + + + + + 1 + + + + + False + False + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Subtitles</b> + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 2 + 6 + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Forced subtitles only + True + 0 + True + + + + + True + True + Spell _Checking + True + 0 + True + + + 1 + + + + + 2 + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Codec: + True + subp-codec-combo + + + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + + + + + + + 1 + + + + + False + False + 3 + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_BUTTONBOX_END + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-close + True + 0 + + + + + False + GTK_PACK_END + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip-ui.xml /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip-ui.xml --- ogmrip-0.11.1/data/ogmrip-ui.xml 2007-10-07 21:03:55.000000000 +0200 +++ ogmrip-0.12.2/data/ogmrip-ui.xml 2008-06-09 21:01:25.000000000 +0200 @@ -14,6 +14,7 @@ + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/ogmrip-x264.glade /tmp/v6alHitLZN/ogmrip-0.12.2/data/ogmrip-x264.glade --- ogmrip-0.11.1/data/ogmrip-x264.glade 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/data/ogmrip-x264.glade 2008-06-09 21:01:25.000000000 +0200 @@ -0,0 +1,358 @@ + + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + GTK_WIN_POS_CENTER_ON_PARENT + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 14 + 2 + 6 + 6 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Use global header (global_header) + 0 + True + + + 2 + 13 + 14 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Select fullpixel motion estimation algorithm (me) + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Diamond search, radius 1 (fast) +Hexagon search, radius 2 +Uneven multi-hexagon search (slow) +Exhaustive search (very slow) + + + 1 + + + + + 2 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + This is used for telling the decoder what capabilities it needs to support. Use this pa- rameter only if you know what it means, and you have a need to set it. + 51 10 51 1 10 10 + + + 1 + 2 + 6 + 7 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 10 0 50000 1 10 10 + + + 1 + 2 + 5 + 6 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 0 50000 1 10 10 + + + 1 + 2 + 4 + 5 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 8 1 8 1 1 1 + + + 1 + 2 + 3 + 4 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 1 16 1 10 10 + + + 1 + 2 + 2 + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Set the bitstream's level (level_idc) + + + 6 + 7 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Averaging period for vbv_maxrate, in kbits (vbv_bufsize) + + + 5 + 6 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Maximum local bitrate, in kbits/second (vbv_maxrate) + + + 4 + 5 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Subpel refinement quality (for qpel) + + + 3 + 4 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Number of previous frames used as predictors in B- and P-frames (frameref) + + + 2 + 3 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Use context-adaptive binary arithmetic coding (CABAC) + 0 + True + + + 2 + 7 + 8 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Allows B-frames to be used as references for predicting other frames (b_pyramid) + 0 + True + + + 2 + 8 + 9 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Use weighted prediction in B-frames (weight_b) + 0 + True + + + 2 + 9 + 10 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Enables rate-distortion optimization of macroblock types in B-frames (brdo) + 0 + True + + + 2 + 10 + 11 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Adaptive spatial transform size (8x8dct) + 0 + True + + + 2 + 11 + 12 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Allows each 8x8 or 16x8 motion partition to independently select a reference frame (mixed_refs) + 0 + True + + + 2 + 12 + 13 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Maximum number of consecutive B-frames between I- and P-frames + + + 1 + 2 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 0 16 1 10 10 + + + 1 + 2 + 1 + 2 + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_BUTTONBOX_END + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-close + True + 0 + + + + + False + GTK_PACK_END + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/profiles.xml /tmp/v6alHitLZN/ogmrip-0.12.2/data/profiles.xml --- ogmrip-0.11.1/data/profiles.xml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/data/profiles.xml 2008-09-21 14:09:54.000000000 +0200 @@ -0,0 +1,570 @@ + + + + + name + + <b>PC, Low Quality</b> 1-pass, 1x700MB (OGM + Lavc + Vorbis) + <b>PC, Basse Qualité</b> 1 passe, 1x700Mo (OGM + Lavc + Vorbis) + + + + container/fourcc + + 0 + + + + container/format + + ogm + + + + container/target_size + + 700 + + + + container/ensure_sync + + false + + + + container/target_number + + 1 + + + + subp/charset + + 0 + + + + subp/codec + + srt + + + + subp/spell_check + + false + + + + subp/eol + + 0 + + + + subp/forced + + false + + + + video/qpel + + false + + + + video/quality + + 0 + + + + video/denoise + + true + + + + video/scaler + + 7 + + + + video/codec + + lavc-mpeg4 + + + + video/turbo + + true + + + + video/encoding + + 0 + + + + video/deblock + + false + + + + video/passes + + 1 + + + + video/threads + + 1 + + + + video/trellis + + true + + + + video/preset + + 2 + + + + video/dering + + false + + + + video/bitrate + + 800 + + + + video/quantizer + + 2 + + + + audio/quality + + 3 + + + + audio/codec + + vorbis + + + + audio/normalize + + true + + + + audio/srate + + 0 + + + + audio/channels + + 1 + + + + + + name + + <b>DivX for Standalone Player</b> 2-pass, 1x700MB (AVI + XviD + MP3) + <b>Compatible Platine DivX</b> 2 passes, 1x700Mo (AVI + XviD + MP3) + + + + container/fourcc + + 3 + + + + container/format + + avi + + + + container/target_size + + 700 + + + + container/ensure_sync + + true + + + + container/target_number + + 1 + + + + subp/charset + + 0 + + + + subp/codec + + srt + + + + subp/spell_check + + false + + + + subp/eol + + 0 + + + + subp/forced + + false + + + + video/qpel + + false + + + + video/quality + + 0 + + + + video/denoise + + true + + + + video/scaler + + 7 + + + + video/codec + + xvid + + + + video/turbo + + true + + + + video/encoding + + 0 + + + + video/deblock + + false + + + + video/passes + + 2 + + + + video/threads + + 1 + + + + video/trellis + + true + + + + video/preset + + 0 + + + + video/dering + + false + + + + video/bitrate + + 800 + + + + video/quantizer + + 2 + + + + audio/quality + + 3 + + + + audio/codec + + mp3 + + + + audio/normalize + + true + + + + audio/srate + + 0 + + + + audio/channels + + 1 + + + + + + name + + <b>PC, High Quality</b> Quantizer 2 (MKV + X264 + AAC) + <b>PC, Haute Qualité</b> Quantizer 2 (MKV + X264 + AAC) + + + + container/fourcc + + 0 + + + + container/format + + mkv + + + + container/target_size + + 1400 + + + + container/ensure_sync + + true + + + + container/target_number + + 1 + + + + subp/charset + + 0 + + + + subp/codec + + srt + + + + subp/spell_check + + false + + + + subp/eol + + 0 + + + + subp/forced + + false + + + + video/qpel + + false + + + + video/quality + + 0 + + + + video/denoise + + true + + + + video/scaler + + 7 + + + + video/codec + + x264 + + + + video/turbo + + true + + + + video/encoding + + 2 + + + + video/deblock + + false + + + + video/passes + + 2 + + + + video/threads + + 1 + + + + video/trellis + + true + + + + video/preset + + 0 + + + + video/dering + + false + + + + video/bitrate + + 800 + + + + video/quantizer + + 2 + + + + audio/quality + + 3 + + + + audio/codec + + aac + + + + audio/normalize + + true + + + + audio/srate + + 0 + + + + audio/channels + + 1 + + + + \ Pas de fin de ligne à la fin du fichier. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/data/profiles.xml.in /tmp/v6alHitLZN/ogmrip-0.12.2/data/profiles.xml.in --- ogmrip-0.11.1/data/profiles.xml.in 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/data/profiles.xml.in 2008-06-09 21:01:25.000000000 +0200 @@ -0,0 +1,566 @@ + + + + name + + <_string><b>PC, Low Quality</b> 1-pass, 1x700MB (OGM + Lavc + Vorbis) + + + + container/fourcc + + 0 + + + + container/format + + ogm + + + + container/target_size + + 700 + + + + container/ensure_sync + + false + + + + container/target_number + + 1 + + + + subp/charset + + 0 + + + + subp/codec + + srt + + + + subp/spell_check + + false + + + + subp/eol + + 0 + + + + subp/forced + + false + + + + video/qpel + + false + + + + video/quality + + 0 + + + + video/denoise + + true + + + + video/scaler + + 7 + + + + video/codec + + lavc-mpeg4 + + + + video/turbo + + true + + + + video/encoding + + 0 + + + + video/deblock + + false + + + + video/passes + + 1 + + + + video/threads + + 1 + + + + video/trellis + + true + + + + video/preset + + 2 + + + + video/dering + + false + + + + video/bitrate + + 800 + + + + video/quantizer + + 2 + + + + audio/quality + + 3 + + + + audio/codec + + vorbis + + + + audio/normalize + + true + + + + audio/srate + + 0 + + + + audio/channels + + 1 + + + + + + name + + <_string><b>DivX for Standalone Player</b> 2-pass, 1x700MB (AVI + XviD + MP3) + + + + container/fourcc + + 3 + + + + container/format + + avi + + + + container/target_size + + 700 + + + + container/ensure_sync + + true + + + + container/target_number + + 1 + + + + subp/charset + + 0 + + + + subp/codec + + srt + + + + subp/spell_check + + false + + + + subp/eol + + 0 + + + + subp/forced + + false + + + + video/qpel + + false + + + + video/quality + + 0 + + + + video/denoise + + true + + + + video/scaler + + 7 + + + + video/codec + + xvid + + + + video/turbo + + true + + + + video/encoding + + 0 + + + + video/deblock + + false + + + + video/passes + + 2 + + + + video/threads + + 1 + + + + video/trellis + + true + + + + video/preset + + 0 + + + + video/dering + + false + + + + video/bitrate + + 800 + + + + video/quantizer + + 2 + + + + audio/quality + + 3 + + + + audio/codec + + mp3 + + + + audio/normalize + + true + + + + audio/srate + + 0 + + + + audio/channels + + 1 + + + + + + name + + <_string><b>PC, High Quality</b> Quantizer 2 (MKV + X264 + AAC) + + + + container/fourcc + + 0 + + + + container/format + + mkv + + + + container/target_size + + 1400 + + + + container/ensure_sync + + true + + + + container/target_number + + 1 + + + + subp/charset + + 0 + + + + subp/codec + + srt + + + + subp/spell_check + + false + + + + subp/eol + + 0 + + + + subp/forced + + false + + + + video/qpel + + false + + + + video/quality + + 0 + + + + video/denoise + + true + + + + video/scaler + + 7 + + + + video/codec + + x264 + + + + video/turbo + + true + + + + video/encoding + + 2 + + + + video/deblock + + false + + + + video/passes + + 2 + + + + video/threads + + 1 + + + + video/trellis + + true + + + + video/preset + + 0 + + + + video/dering + + false + + + + video/bitrate + + 800 + + + + video/quantizer + + 2 + + + + audio/quality + + 3 + + + + audio/codec + + aac + + + + audio/normalize + + true + + + + audio/srate + + 0 + + + + audio/channels + + 1 + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/debian/changelog /tmp/v6alHitLZN/ogmrip-0.12.2/debian/changelog --- ogmrip-0.11.1/debian/changelog 2008-10-03 18:52:49.000000000 +0200 +++ ogmrip-0.12.2/debian/changelog 2008-10-03 18:52:49.000000000 +0200 @@ -1,24 +1,69 @@ -ogmrip (0.11.1-0.1ubuntu1) hardy; urgency=low +ogmrip (0.12.2-0.0ubuntu1) intrepid; urgency=low - * debian/libogmrip0.install : - - Don't install the .desktop file in the library package - (LP: #204448) - * debian/rules, debian/control : - - Build with --with-ocr=ocrad : ogmrip can't choose at - runtime, so we have to make a choice at build time. - - Add ocrad to build-dep - - Don't depend on gocr - - LP: #200600 - * debian/ogmrip-doc.links : - - Link ogm rip doc to /usr/share/gtk-doc so that they - could appear in devhelp. - * debian/control : - - Use the new control field Homepage - * Bump Standards-Version to 3.7.3 - * Modify Maintainer value to match the DebianMaintainerField - specification. + * Merge from Debian unstable. + * Ubuntu changes: + - debian/libogmrip0.install & debian/install: + + Don't install the .desktop file in the library package (LP: #204448) + - debian/rules: + + Drop configure flag --with-ocr=ocrad (introduced to fix LP #200600), + as ogmrip now detect at runtime the ocr. + - debian/control: + + Set Depends for ocr to tesseract | ocrad | gocr . (LP: #247826) + + Modify Maintainer value to match the DebianMaintainerField specification. - -- Florent Mertens Sun, 16 Mar 2008 20:37:47 +0100 + -- Julien Lavergne Fri, 03 Oct 2008 17:43:54 +0200 + +ogmrip (0.12.2-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 29 Sep 2008 08:19:44 +0200 + +ogmrip (0.12.1-0.2) unstable; urgency=low + + * ogmrip need to depends on gpac for mp4 file. + + -- Christian Marillat Fri, 19 Sep 2008 09:06:46 +0200 + +ogmrip (0.12.1-0.1) unstable; urgency=low + + * Remove libgtk2.0-dev and add libglade2-dev, intltool and libgconf2-dev + as dependencies for the libogmrip-dev package. + * Don't package .la files and remove .a files from plugins directories. + * Added libnotify-dev-gtk2.10 in Build-depends. + * debian/rules Call quilt cleanly. + + -- Christian Marillat Mon, 25 Aug 2008 16:14:26 +0200 + +ogmrip (0.12.1-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 15 Jul 2008 09:02:49 +0200 + +ogmrip (0.12.0-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 23 Jun 2008 10:25:15 +0200 + +ogmrip (0.11.2-0.1) unstable; urgency=low + + * Removed gocr from Depends field. + + -- Christian Marillat Sat, 19 Jan 2008 21:53:01 +0100 + +ogmrip (0.11.2-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 23 Dec 2007 10:16:57 +0100 + +ogmrip (0.11.1-0.2) unstable; urgency=low + + * debian/watch fix address. + + -- Christian Marillat Sat, 17 Nov 2007 16:41:09 +0100 ogmrip (0.11.1-0.1) unstable; urgency=low diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/debian/compat /tmp/v6alHitLZN/ogmrip-0.12.2/debian/compat --- ogmrip-0.11.1/debian/compat 2008-10-03 18:52:49.000000000 +0200 +++ ogmrip-0.12.2/debian/compat 2008-10-03 18:52:49.000000000 +0200 @@ -1 +1 @@ -4 +7 diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/debian/control /tmp/v6alHitLZN/ogmrip-0.12.2/debian/control --- ogmrip-0.11.1/debian/control 2008-10-03 18:52:49.000000000 +0200 +++ ogmrip-0.12.2/debian/control 2008-10-03 18:52:49.000000000 +0200 @@ -4,17 +4,17 @@ Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Christian Marillat Bugs: mailto:marillat@debian.org -Standards-Version: 3.7.3 -Build-Depends: debhelper (>= 5), libdvdread-dev, libhal-dev, eject, mplayer, +Homepage: http://ogmrip.sourceforge.net +Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 7), libdvdread-dev, libhal-dev, eject, mplayer, mencoder, libenchant-dev, vorbis-tools (>= 1.0), lame, libgconf2-dev, libglade2-dev, mkvtoolnix (>= 0.9.5), libtheora-dev, faac, libvorbis-dev, libdbus-glib-1-dev, libx264-dev, libenca-dev, ogmtools, libxml-parser-perl, - quilt, ocrad -Homepage: http://ogmrip.sourceforge.net + quilt, libnotify-dev-gtk2.10 Package: ogmrip Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, mplayer, mencoder, ogmtools, vorbis-tools (>= 1.0), lame (>= 3.96), mkvtoolnix (>= 0.9.5), faac (>= 1.24), ocrad +Depends: ${shlibs:Depends}, ${misc:Depends}, mplayer, mencoder, ogmtools, vorbis-tools (>= 1.0), lame (>= 3.96), mkvtoolnix (>= 0.9.5), faac (>= 1.24), tesseract | ocrad | gocr, gpac Recommends: ogmrip-doc Description: Application for ripping and encoding DVD ogmrip is an application and a set of libraries for ripping and encoding @@ -69,7 +69,7 @@ Package: libogmrip-dev Architecture: any Section: libdevel -Depends: libogmrip0 (>= ${source:Version}), libgtk2.0-dev, libenca-dev +Depends: libogmrip0 (>= ${source:Version}), libenca-dev, libglade2-dev, libgconf2-dev, intltool Description: Application for ripping and encoding DVD - development files ogmrip is an application and a set of libraries for ripping and encoding DVD into AVI, OGM MP4 or Matroska files using a wide variety of codecs. It diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/debian/libogmrip-dev.install /tmp/v6alHitLZN/ogmrip-0.12.2/debian/libogmrip-dev.install --- ogmrip-0.11.1/debian/libogmrip-dev.install 2008-10-03 18:52:49.000000000 +0200 +++ ogmrip-0.12.2/debian/libogmrip-dev.install 2008-10-03 18:52:49.000000000 +0200 @@ -1,5 +1,4 @@ debian/tmp/usr/include debian/tmp/usr/lib/*.a -debian/tmp/usr/lib/*.la debian/tmp/usr/lib/*.so debian/tmp/usr/lib/pkgconfig diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/debian/ogmrip-doc.links /tmp/v6alHitLZN/ogmrip-0.12.2/debian/ogmrip-doc.links --- ogmrip-0.11.1/debian/ogmrip-doc.links 2008-10-03 18:52:49.000000000 +0200 +++ ogmrip-0.12.2/debian/ogmrip-doc.links 2008-10-03 18:52:49.000000000 +0200 @@ -1,5 +1 @@ -usr/share/doc/ogmrip/html/ogmdvd usr/share/gtk-doc/html/ogmdvd -usr/share/doc/ogmrip/html/ogmdvd-gtk usr/share/gtk-doc/html/ogmdvd-gtk -usr/share/doc/ogmrip/html/ogmjob usr/share/gtk-doc/html/ogmjob -usr/share/doc/ogmrip/html/ogmrip usr/share/gtk-doc/html/ogmrip -usr/share/doc/ogmrip/html/ogmrip-gtk usr/share/gtk-doc/html/ogmrip-gtk +usr/share/doc/ogmrip/html usr/share/gtk-doc/html/ogmrip diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/debian/patches/01_desktop-file-fix-category.patch /tmp/v6alHitLZN/ogmrip-0.12.2/debian/patches/01_desktop-file-fix-category.patch --- ogmrip-0.11.1/debian/patches/01_desktop-file-fix-category.patch 2008-10-03 18:52:49.000000000 +0200 +++ ogmrip-0.12.2/debian/patches/01_desktop-file-fix-category.patch 2008-10-03 18:52:49.000000000 +0200 @@ -1,5 +1,5 @@ ---- ogmrip-0.11.1.orig/data/ogmrip.desktop 2007-09-30 20:48:30.000000000 +0200 -+++ ogmrip-0.11.1/data/ogmrip.desktop 2007-10-09 22:37:49.000000000 +0200 +--- ogmrip-0.11.1.orig/data/ogmrip.desktop.in 2007-09-30 20:48:30.000000000 +0200 ++++ ogmrip-0.11.1/data/ogmrip.desktop.in 2007-10-09 22:37:49.000000000 +0200 @@ -17,4 +17,4 @@ StartupNotify=true Terminal=false diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/debian/rules /tmp/v6alHitLZN/ogmrip-0.12.2/debian/rules --- ogmrip-0.11.1/debian/rules 2008-10-03 18:52:49.000000000 +0200 +++ ogmrip-0.12.2/debian/rules 2008-10-03 18:52:49.000000000 +0200 @@ -2,6 +2,8 @@ #export DH_VERBOSE=1 +include /usr/share/quilt/quilt.make + DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -15,27 +17,21 @@ NCPUS:=1 endif -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) else - CFLAGS += -O2 + CROSS= --build $(DEB_BUILD_GNU_TYPE) endif - configure: configure-stamp -configure-stamp: +configure-stamp: debian/stamp-patched dh_testdir - QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - - CFLAGS="$(CFLAGS)" ./configure --mandir=\$${prefix}/share/man \ + ./configure $(CROSS) --mandir=\$${prefix}/share/man \ --prefix=/usr --sysconfdir=\$${prefix}/share \ - --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) - --with-ocr=ocrad + CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,--as-needed" - touch configure-stamp + touch $@ build: build-stamp build-stamp: configure-stamp @@ -43,19 +39,16 @@ $(MAKE) -j $(NCPUS) - touch build-stamp + touch $@ -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp configure-stamp [ ! -f Makefile ] || $(MAKE) distclean - QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 - - -rm -rf .pc - dh_clean intltool-extract intltool-merge intltool-update time_stats_log + dh_clean intltool-extract intltool-merge intltool-update install: build dh_testdir @@ -65,6 +58,9 @@ $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr + find debian/tmp/usr/lib/ogmrip -name *.a |xargs rm + find debian/tmp/usr/lib -name *.la |xargs rm + # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -95,7 +91,7 @@ dh_strip -a dh_compress -a dh_fixperms -a - dh_makeshlibs -a -V "libogmrip0 (>= 0.11.1)" + dh_makeshlibs -a -V dh_installdeb -a dh_shlibdeps -a dh_gencontrol -a @@ -103,4 +99,4 @@ dh_builddeb -a binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build clean binary-indep binary-arch binary install configure diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/debian/watch /tmp/v6alHitLZN/ogmrip-0.12.2/debian/watch --- ogmrip-0.11.1/debian/watch 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/debian/watch 2008-10-03 18:52:49.000000000 +0200 @@ -0,0 +1,4 @@ +version=3 + +opts=uversionmangle=s/video-copy-// \ +http://sf.net/ogmrip/ogmrip-(.*)\.tar\.gz diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/Makefile.in /tmp/v6alHitLZN/ogmrip-0.12.2/docs/Makefile.in --- ogmrip-0.11.1/docs/Makefile.in 2007-10-21 21:05:55.000000000 +0200 +++ ogmrip-0.12.2/docs/Makefile.in 2008-09-21 14:16:34.000000000 +0200 @@ -39,8 +39,7 @@ subdir = docs DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -83,6 +82,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ DVDREAD_LIBS = @DVDREAD_LIBS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -96,7 +96,6 @@ ENCHANT_LIBS = @ENCHANT_LIBS@ EXEEXT = @EXEEXT@ F77 = @F77@ -FAAC_PROG = @FAAC_PROG@ FFLAGS = @FFLAGS@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ @@ -107,8 +106,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GOCR_PROG = @GOCR_PROG@ GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ GUI_CFLAGS = @GUI_CFLAGS@ @@ -117,24 +116,38 @@ HAL_LIBS = @HAL_LIBS@ HAVE_AAC_SUPPORT_FALSE = @HAVE_AAC_SUPPORT_FALSE@ HAVE_AAC_SUPPORT_TRUE = @HAVE_AAC_SUPPORT_TRUE@ -HAVE_DTS_SUPPORT_FALSE = @HAVE_DTS_SUPPORT_FALSE@ -HAVE_DTS_SUPPORT_TRUE = @HAVE_DTS_SUPPORT_TRUE@ HAVE_ENCHANT_SUPPORT_FALSE = @HAVE_ENCHANT_SUPPORT_FALSE@ HAVE_ENCHANT_SUPPORT_TRUE = @HAVE_ENCHANT_SUPPORT_TRUE@ HAVE_GTK_SUPPORT_FALSE = @HAVE_GTK_SUPPORT_FALSE@ HAVE_GTK_SUPPORT_TRUE = @HAVE_GTK_SUPPORT_TRUE@ +HAVE_LAVC_SUPPORT_FALSE = @HAVE_LAVC_SUPPORT_FALSE@ +HAVE_LAVC_SUPPORT_TRUE = @HAVE_LAVC_SUPPORT_TRUE@ HAVE_LAVF_SUPPORT_FALSE = @HAVE_LAVF_SUPPORT_FALSE@ HAVE_LAVF_SUPPORT_TRUE = @HAVE_LAVF_SUPPORT_TRUE@ HAVE_MKV_SUPPORT_FALSE = @HAVE_MKV_SUPPORT_FALSE@ HAVE_MKV_SUPPORT_TRUE = @HAVE_MKV_SUPPORT_TRUE@ +HAVE_MP3_SUPPORT_FALSE = @HAVE_MP3_SUPPORT_FALSE@ +HAVE_MP3_SUPPORT_TRUE = @HAVE_MP3_SUPPORT_TRUE@ +HAVE_MP4_SUPPORT_FALSE = @HAVE_MP4_SUPPORT_FALSE@ +HAVE_MP4_SUPPORT_TRUE = @HAVE_MP4_SUPPORT_TRUE@ +HAVE_OGM_SUPPORT_FALSE = @HAVE_OGM_SUPPORT_FALSE@ +HAVE_OGM_SUPPORT_TRUE = @HAVE_OGM_SUPPORT_TRUE@ +HAVE_PNG_SUPPORT_FALSE = @HAVE_PNG_SUPPORT_FALSE@ +HAVE_PNG_SUPPORT_TRUE = @HAVE_PNG_SUPPORT_TRUE@ HAVE_SRT_SUPPORT_FALSE = @HAVE_SRT_SUPPORT_FALSE@ HAVE_SRT_SUPPORT_TRUE = @HAVE_SRT_SUPPORT_TRUE@ HAVE_THEORA_SUPPORT_FALSE = @HAVE_THEORA_SUPPORT_FALSE@ HAVE_THEORA_SUPPORT_TRUE = @HAVE_THEORA_SUPPORT_TRUE@ +HAVE_TIFF_SUPPORT_FALSE = @HAVE_TIFF_SUPPORT_FALSE@ +HAVE_TIFF_SUPPORT_TRUE = @HAVE_TIFF_SUPPORT_TRUE@ +HAVE_VORBIS_SUPPORT_FALSE = @HAVE_VORBIS_SUPPORT_FALSE@ +HAVE_VORBIS_SUPPORT_TRUE = @HAVE_VORBIS_SUPPORT_TRUE@ HAVE_X264_SUPPORT_FALSE = @HAVE_X264_SUPPORT_FALSE@ HAVE_X264_SUPPORT_TRUE = @HAVE_X264_SUPPORT_TRUE@ HAVE_XSLTPROC_PROG_FALSE = @HAVE_XSLTPROC_PROG_FALSE@ HAVE_XSLTPROC_PROG_TRUE = @HAVE_XSLTPROC_PROG_TRUE@ +HAVE_XVID_SUPPORT_FALSE = @HAVE_XVID_SUPPORT_FALSE@ +HAVE_XVID_SUPPORT_TRUE = @HAVE_XVID_SUPPORT_TRUE@ HTML_DIR = @HTML_DIR@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -146,14 +159,12 @@ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_ICONV = @INTLTOOL_ICONV@ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -165,16 +176,19 @@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -LAME_PROG = @LAME_PROG@ LDFLAGS = @LDFLAGS@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ +LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBTIFF_LIBS = @LIBTIFF_LIBS@ LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -183,21 +197,15 @@ MAKEINFO = @MAKEINFO@ MENCODER_PROG = @MENCODER_PROG@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MKVMERGE_PROG = @MKVMERGE_PROG@ -MPLAYER_MAJOR_VERSION = @MPLAYER_MAJOR_VERSION@ -MPLAYER_MINOR_VERSION = @MPLAYER_MINOR_VERSION@ -MPLAYER_PRE_VERSION = @MPLAYER_PRE_VERSION@ MPLAYER_PROG = @MPLAYER_PROG@ -MPLAYER_RC_VERSION = @MPLAYER_RC_VERSION@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ -OCRAD_PROG = @OCRAD_PROG@ -OGGENC_PROG = @OGGENC_PROG@ OGMDVD_GTK_LT_VERSION = @OGMDVD_GTK_LT_VERSION@ OGMDVD_LT_VERSION = @OGMDVD_LT_VERSION@ OGMJOB_LT_VERSION = @OGMJOB_LT_VERSION@ -OGMMERGE_PROG = @OGMMERGE_PROG@ OGMRIP_CFLAGS = @OGMRIP_CFLAGS@ OGMRIP_GTK_LT_VERSION = @OGMRIP_GTK_LT_VERSION@ OGMRIP_LIBS = @OGMRIP_LIBS@ @@ -206,7 +214,6 @@ OGMRIP_MICRO_VERSION = @OGMRIP_MICRO_VERSION@ OGMRIP_MINOR_VERSION = @OGMRIP_MINOR_VERSION@ OGMRIP_VERSION = @OGMRIP_VERSION@ -OGMSPLIT_PROG = @OGMSPLIT_PROG@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/Makefile.am /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/Makefile.am --- ogmrip-0.11.1/docs/reference/Makefile.am 2007-10-07 21:03:53.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/Makefile.am 2008-07-15 23:46:36.000000000 +0200 @@ -5,8 +5,8 @@ endif SUBDIRS = \ - $(GTK_SUBDIRS) \ - ogmdvd \ - ogmjob \ - ogmrip + $(GTK_SUBDIRS) \ + ogmdvd \ + ogmjob \ + ogmrip diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/Makefile.in /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/Makefile.in --- ogmrip-0.11.1/docs/reference/Makefile.in 2007-10-21 21:05:55.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/Makefile.in 2008-09-21 14:16:34.000000000 +0200 @@ -38,8 +38,7 @@ subdir = docs/reference DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -82,6 +81,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ DVDREAD_LIBS = @DVDREAD_LIBS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -95,7 +95,6 @@ ENCHANT_LIBS = @ENCHANT_LIBS@ EXEEXT = @EXEEXT@ F77 = @F77@ -FAAC_PROG = @FAAC_PROG@ FFLAGS = @FFLAGS@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ @@ -106,8 +105,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GOCR_PROG = @GOCR_PROG@ GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ GUI_CFLAGS = @GUI_CFLAGS@ @@ -116,24 +115,38 @@ HAL_LIBS = @HAL_LIBS@ HAVE_AAC_SUPPORT_FALSE = @HAVE_AAC_SUPPORT_FALSE@ HAVE_AAC_SUPPORT_TRUE = @HAVE_AAC_SUPPORT_TRUE@ -HAVE_DTS_SUPPORT_FALSE = @HAVE_DTS_SUPPORT_FALSE@ -HAVE_DTS_SUPPORT_TRUE = @HAVE_DTS_SUPPORT_TRUE@ HAVE_ENCHANT_SUPPORT_FALSE = @HAVE_ENCHANT_SUPPORT_FALSE@ HAVE_ENCHANT_SUPPORT_TRUE = @HAVE_ENCHANT_SUPPORT_TRUE@ HAVE_GTK_SUPPORT_FALSE = @HAVE_GTK_SUPPORT_FALSE@ HAVE_GTK_SUPPORT_TRUE = @HAVE_GTK_SUPPORT_TRUE@ +HAVE_LAVC_SUPPORT_FALSE = @HAVE_LAVC_SUPPORT_FALSE@ +HAVE_LAVC_SUPPORT_TRUE = @HAVE_LAVC_SUPPORT_TRUE@ HAVE_LAVF_SUPPORT_FALSE = @HAVE_LAVF_SUPPORT_FALSE@ HAVE_LAVF_SUPPORT_TRUE = @HAVE_LAVF_SUPPORT_TRUE@ HAVE_MKV_SUPPORT_FALSE = @HAVE_MKV_SUPPORT_FALSE@ HAVE_MKV_SUPPORT_TRUE = @HAVE_MKV_SUPPORT_TRUE@ +HAVE_MP3_SUPPORT_FALSE = @HAVE_MP3_SUPPORT_FALSE@ +HAVE_MP3_SUPPORT_TRUE = @HAVE_MP3_SUPPORT_TRUE@ +HAVE_MP4_SUPPORT_FALSE = @HAVE_MP4_SUPPORT_FALSE@ +HAVE_MP4_SUPPORT_TRUE = @HAVE_MP4_SUPPORT_TRUE@ +HAVE_OGM_SUPPORT_FALSE = @HAVE_OGM_SUPPORT_FALSE@ +HAVE_OGM_SUPPORT_TRUE = @HAVE_OGM_SUPPORT_TRUE@ +HAVE_PNG_SUPPORT_FALSE = @HAVE_PNG_SUPPORT_FALSE@ +HAVE_PNG_SUPPORT_TRUE = @HAVE_PNG_SUPPORT_TRUE@ HAVE_SRT_SUPPORT_FALSE = @HAVE_SRT_SUPPORT_FALSE@ HAVE_SRT_SUPPORT_TRUE = @HAVE_SRT_SUPPORT_TRUE@ HAVE_THEORA_SUPPORT_FALSE = @HAVE_THEORA_SUPPORT_FALSE@ HAVE_THEORA_SUPPORT_TRUE = @HAVE_THEORA_SUPPORT_TRUE@ +HAVE_TIFF_SUPPORT_FALSE = @HAVE_TIFF_SUPPORT_FALSE@ +HAVE_TIFF_SUPPORT_TRUE = @HAVE_TIFF_SUPPORT_TRUE@ +HAVE_VORBIS_SUPPORT_FALSE = @HAVE_VORBIS_SUPPORT_FALSE@ +HAVE_VORBIS_SUPPORT_TRUE = @HAVE_VORBIS_SUPPORT_TRUE@ HAVE_X264_SUPPORT_FALSE = @HAVE_X264_SUPPORT_FALSE@ HAVE_X264_SUPPORT_TRUE = @HAVE_X264_SUPPORT_TRUE@ HAVE_XSLTPROC_PROG_FALSE = @HAVE_XSLTPROC_PROG_FALSE@ HAVE_XSLTPROC_PROG_TRUE = @HAVE_XSLTPROC_PROG_TRUE@ +HAVE_XVID_SUPPORT_FALSE = @HAVE_XVID_SUPPORT_FALSE@ +HAVE_XVID_SUPPORT_TRUE = @HAVE_XVID_SUPPORT_TRUE@ HTML_DIR = @HTML_DIR@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -145,14 +158,12 @@ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_ICONV = @INTLTOOL_ICONV@ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -164,16 +175,19 @@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -LAME_PROG = @LAME_PROG@ LDFLAGS = @LDFLAGS@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ +LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBTIFF_LIBS = @LIBTIFF_LIBS@ LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -182,21 +196,15 @@ MAKEINFO = @MAKEINFO@ MENCODER_PROG = @MENCODER_PROG@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MKVMERGE_PROG = @MKVMERGE_PROG@ -MPLAYER_MAJOR_VERSION = @MPLAYER_MAJOR_VERSION@ -MPLAYER_MINOR_VERSION = @MPLAYER_MINOR_VERSION@ -MPLAYER_PRE_VERSION = @MPLAYER_PRE_VERSION@ MPLAYER_PROG = @MPLAYER_PROG@ -MPLAYER_RC_VERSION = @MPLAYER_RC_VERSION@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ -OCRAD_PROG = @OCRAD_PROG@ -OGGENC_PROG = @OGGENC_PROG@ OGMDVD_GTK_LT_VERSION = @OGMDVD_GTK_LT_VERSION@ OGMDVD_LT_VERSION = @OGMDVD_LT_VERSION@ OGMJOB_LT_VERSION = @OGMJOB_LT_VERSION@ -OGMMERGE_PROG = @OGMMERGE_PROG@ OGMRIP_CFLAGS = @OGMRIP_CFLAGS@ OGMRIP_GTK_LT_VERSION = @OGMRIP_GTK_LT_VERSION@ OGMRIP_LIBS = @OGMRIP_LIBS@ @@ -205,7 +213,6 @@ OGMRIP_MICRO_VERSION = @OGMRIP_MICRO_VERSION@ OGMRIP_MINOR_VERSION = @OGMRIP_MINOR_VERSION@ OGMRIP_VERSION = @OGMRIP_VERSION@ -OGMSPLIT_PROG = @OGMSPLIT_PROG@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -282,10 +289,10 @@ @HAVE_GTK_SUPPORT_TRUE@ ogmrip-gtk SUBDIRS = \ - $(GTK_SUBDIRS) \ - ogmdvd \ - ogmjob \ - ogmrip + $(GTK_SUBDIRS) \ + ogmdvd \ + ogmjob \ + ogmrip all: all-recursive diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/index.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/index.html --- ogmrip-0.11.1/docs/reference/ogmdvd/html/index.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/index.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,18 @@ - + OGMDvd Reference Manual - + - - + + - - + + -
+ +
@@ -23,33 +24,43 @@
I. Types and functions
-Types — Public data structures used throughout OGMDvd +Types — Public data structures used throughout OGMDvd
-Enumerations — Public enumerated types used throughout OGMDvd +Enumerations — Public enumerated types used throughout OGMDvd
-Conversion functions — Converts enumerated types into human readable strings +Conversion functions — Converts enumerated types into human readable strings +
+
+Reader — Reads the content of a DVD +
+
+Parser — Parses the content of a DVD
II. Library Reference
-OGMDvdDisc — Structure describing a video DVD +OGMDvdDisc — Structure describing a video DVD
-OGMDvdTitle — Structure describing a DVD title +OGMDvdTitle — Structure describing a DVD title
-OGMDvdStream — Structure describing a stream +OGMDvdStream — Structure describing a stream
-OGMDvdAudio — Structure describing an audio stream +OGMDvdAudio — Structure describing an audio stream
-OGMDvdSubp — Structure describing a subtitles stream +OGMDvdSubp — Structure describing a subtitles stream
-
+
+
+
+ Generated by GTK-Doc V1.10
+ diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/index.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/index.sgml --- ogmrip-0.11.1/docs/reference/ogmdvd/html/index.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/index.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -1,61 +1,30 @@ + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -66,27 +35,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + @@ -102,20 +93,33 @@ + + + + + + + + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-api.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-api.html --- ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-api.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-api.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,34 +1,57 @@ - -Part II. Library Reference - + +Part II. Library Reference + - + - + - - + + - - + +

-Part II. Library Reference

+Part II. Library Reference

This section contains the API reference for ogmdvd. All the public interfaces are documented here.

+
+

Table of Contents

+
+
+OGMDvdDisc — Structure describing a video DVD +
+
+OGMDvdTitle — Structure describing a DVD title +
+
+OGMDvdStream — Structure describing a stream +
+
+OGMDvdAudio — Structure describing an audio stream +
+
+OGMDvdSubp — Structure describing a subtitles stream +
+
+ +
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd.devhelp /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd.devhelp --- ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd.devhelp 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd.devhelp 2008-09-28 19:28:17.000000000 +0200 @@ -6,6 +6,8 @@ + + @@ -21,6 +23,8 @@ + + @@ -39,17 +43,33 @@ + + + + + + + + + + + + + + + + @@ -65,18 +85,22 @@ + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd.devhelp2 /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd.devhelp2 --- ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd.devhelp2 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd.devhelp2 2008-09-28 19:28:17.000000000 +0200 @@ -6,6 +6,8 @@ + + @@ -21,6 +23,8 @@ + + @@ -39,17 +43,33 @@ + + + + + + + + + + + + + + + + @@ -65,18 +85,22 @@ + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-audio.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-audio.html --- ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-audio.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-audio.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + OGMDvdAudio - + - + - + - - + + @@ -22,48 +22,48 @@ - +
-

-OGMDvdAudio -

-

OGMDvdAudio — Structure describing an audio stream

+

OGMDvdAudio

+

OGMDvdAudio — Structure describing an audio stream
-

Synopsis

+

Synopsis

 
 #include <ogmdvd-audio.h>
 
-
 gint                ogmdvd_audio_stream_get_format      (OGMDvdAudioStream *audio);
+>gint                ogmdvd_audio_stream_get_format      (OGMDvdAudioStream *audio);
+gint                ogmdvd_audio_stream_get_channels    (OGMDvdAudioStream *audio);
 gint                ogmdvd_audio_stream_get_channels    (OGMDvdAudioStream *audio);
+>gint                ogmdvd_audio_stream_get_language    (OGMDvdAudioStream *audio);
 gint                ogmdvd_audio_stream_get_language    (OGMDvdAudioStream *audio);
+>gint                ogmdvd_audio_stream_get_quantization
+                                                        (OGMDvdAudioStream *audio);
 gint                ogmdvd_audio_stream_get_quantization
-                                                        (OGMDvdAudioStream *audio);
+>gint                ogmdvd_audio_stream_get_content     (OGMDvdAudioStream *audio);
 gint                ogmdvd_audio_stream_get_content     (OGMDvdAudioStream *audio);
+>gint                ogmdvd_audio_stream_get_bitrate     (OGMDvdAudioStream *audio);
-

Description

+

Description

@@ -71,13 +71,12 @@

-

Details

+

Details

-

-ogmdvd_audio_stream_get_format ()

-
ogmdvd_audio_stream_get_format ()

+
gint                ogmdvd_audio_stream_get_format      (OGMDvdAudioStream *audio);

+>gint                ogmdvd_audio_stream_get_format      (OGMDvdAudioStream *audio);

Returns the format of the audio stream.

@@ -87,13 +86,13 @@ -audio : - An OGMDvdAudioStream +

audio :

+ An OGMDvdAudioStream -Returns : - OGMDvdAudioFormat, or -1 +

Returns :

+ OGMDvdAudioFormat, or -1 @@ -101,11 +100,10 @@
-

-ogmdvd_audio_stream_get_channels ()

-
ogmdvd_audio_stream_get_channels ()

+
gint                ogmdvd_audio_stream_get_channels    (OGMDvdAudioStream *audio);

+>gint                ogmdvd_audio_stream_get_channels    (OGMDvdAudioStream *audio);

Returns the number of channels of the audio stream.

@@ -115,13 +113,13 @@ -audio : - An OGMDvdAudioStream +

audio :

+ An OGMDvdAudioStream -Returns : - OGMDvdAudioChannels, or -1 +

Returns :

+ OGMDvdAudioChannels, or -1 @@ -129,11 +127,10 @@
-

-ogmdvd_audio_stream_get_language ()

-
ogmdvd_audio_stream_get_language ()

+
gint                ogmdvd_audio_stream_get_language    (OGMDvdAudioStream *audio);

+>gint                ogmdvd_audio_stream_get_language    (OGMDvdAudioStream *audio);

Returns the language of the audio stream.

@@ -143,12 +140,12 @@ -audio : - An OGMDvdAudioStream +

audio :

+ An OGMDvdAudioStream -Returns : +

Returns :

the language code, or -1 @@ -157,12 +154,11 @@
-

-ogmdvd_audio_stream_get_quantization ()

-
ogmdvd_audio_stream_get_quantization ()

+
gint                ogmdvd_audio_stream_get_quantization
-                                                        (OGMDvdAudioStream *audio);

+                                                        (OGMDvdAudioStream *audio);

Returns the quantization of the audio stream.

@@ -172,13 +168,13 @@ -audio : - An OGMDvdAudioStream +

audio :

+ An OGMDvdAudioStream -Returns : - OGMDvdAudioQuantization, or -1 +

Returns :

+ OGMDvdAudioQuantization, or -1 @@ -186,11 +182,10 @@
-

-ogmdvd_audio_stream_get_content ()

-
ogmdvd_audio_stream_get_content ()

+
gint                ogmdvd_audio_stream_get_content     (OGMDvdAudioStream *audio);

+>gint                ogmdvd_audio_stream_get_content     (OGMDvdAudioStream *audio);

Returns the content of the audio stream.

@@ -200,19 +195,49 @@ -audio : - An OGMDvdAudioStream +

audio :

+ An OGMDvdAudioStream -Returns : - OGMDvdAudioContent, or -1 +

Returns :

+ OGMDvdAudioContent, or -1
+
+
+

ogmdvd_audio_stream_get_bitrate ()

+
gint                ogmdvd_audio_stream_get_bitrate     (OGMDvdAudioStream *audio);
+

+Returns the bitrate of the audio stream in bps.

+

+ +

+
++ + + + + + + + + + +

audio :

 An OGMDvdAudioStream +

Returns :

 the bitrate, or -1 +
+ +
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-disc.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-disc.html --- ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-disc.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-disc.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + OGMDvdDisc - + - - + + - + - - + + @@ -22,57 +22,60 @@ - +
-

-OGMDvdDisc -

-

OGMDvdDisc — Structure describing a video DVD

+

OGMDvdDisc

+

OGMDvdDisc — Structure describing a video DVD
-

Synopsis

+

Synopsis

 
 #include <ogmdvd-disc.h>
 
-
-enum                OGMDvdDiscError;
-OGMDvdDisc*         ogmdvd_disc_open                    (const OGMDvdDiscError;
+OGMDvdDisc*         ogmdvd_disc_open                    (const gchar *device,
                                                          GError **error);
-void                ogmdvd_disc_ref                     (OGMDvdDisc *disc);
-void                ogmdvd_disc_unref                   (OGMDvdDisc *disc);
+void                ogmdvd_disc_ref                     (OGMDvdDisc *disc);
+void                ogmdvd_disc_unref                   (OGMDvdDisc *disc);
+gchar*              ogmdvd_disc_get_label               (OGMDvdDisc *disc);
 gchar*              ogmdvd_disc_get_label               (OGMDvdDisc *disc);
+>gchar*              ogmdvd_disc_get_id                  (OGMDvdDisc *disc);
 gchar*              ogmdvd_disc_get_device              (OGMDvdDisc *disc);
+>gchar*              ogmdvd_disc_get_device              (OGMDvdDisc *disc);
 gint64              ogmdvd_disc_get_vmg_size            (OGMDvdDisc *disc);
+>gint64              ogmdvd_disc_get_vmg_size            (OGMDvdDisc *disc);
 gint                ogmdvd_disc_get_n_titles            (OGMDvdDisc *disc);
-OGMDvdTitle*        ogmdvd_disc_get_nth_title           (OGMDvdDisc *disc,
+>gint                ogmdvd_disc_get_n_titles            (OGMDvdDisc *disc);
+OGMDvdTitle*        ogmdvd_disc_get_nth_title           (OGMDvdDisc *disc,
                                                          guint nr);
+GList*              ogmdvd_disc_get_titles              (OGMDvdDisc *disc);
-

Description

+

Description

@@ -80,11 +83,10 @@

-

Details

+

Details

-

-enum OGMDvdDiscError

-
typedef enum
+
enum OGMDvdDiscError

+
typedef enum
 {
   OGMDVD_DISC_ERROR_EXIST,  /* No such file or directory */
   OGMDVD_DISC_ERROR_PERM,   /* Permission denied to access device */
@@ -97,7 +99,7 @@
 } OGMDvdDiscError;
 

 

-Error codes returned by ogmdvd_disc_open()

+Error codes returned by ogmdvd_disc_open()

 

 
 

@@ -105,42 +107,42 @@
 
 
 
-OGMDVD_DISC_ERROR_EXIST
+
OGMDVD_DISC_ERROR_EXIST

  No such file or directory
 
 
 
-OGMDVD_DISC_ERROR_PERM
+
OGMDVD_DISC_ERROR_PERM

  Permission denied to access device
 
 
 
-OGMDVD_DISC_ERROR_TRAY
+
OGMDVD_DISC_ERROR_TRAY

  Tray seems to be opened
 
 
 
-OGMDVD_DISC_ERROR_DEV
+
OGMDVD_DISC_ERROR_DEV

  Device does not contain a valid DVD video
 
 
 
-OGMDVD_DISC_ERROR_PATH
+
OGMDVD_DISC_ERROR_PATH

  Path does not contain a valid DVD structure
 
 
 
-OGMDVD_DISC_ERROR_ACCESS
+
OGMDVD_DISC_ERROR_ACCESS

  No such directory, block device or iso file
 
 
 
-OGMDVD_DISC_ERROR_VMG
+
OGMDVD_DISC_ERROR_VMG

  Cannot open video manager
 
 
 
-OGMDVD_DISC_ERROR_UNKNOWN
+
OGMDVD_DISC_ERROR_UNKNOWN

  Unknown error
 
 
@@ -149,16 +151,15 @@
-

-ogmdvd_disc_open ()

-
OGMDvdDisc*         ogmdvd_disc_open                    (const 
ogmdvd_disc_open ()

+
OGMDvdDisc*         ogmdvd_disc_open                    (const gchar *device,
                                                          GError **error);

 

-Creates a new OGMDvdDisc given a DVD device.

+Creates a new OGMDvdDisc given a DVD device.

 

 
 

@@ -166,18 +167,18 @@
 
 
 
-device :
+
device :

  A DVD device.
 
 
 
-error :
+
error :

  Location to store the error occuring, or NULL to ignore errors.
 
 
 
-Returns :
- The new OGMDvdDisc, or NULL
+
Returns :

+ The new OGMDvdDisc, or NULL
 
 
 
@@ -185,49 +186,46 @@
-

-ogmdvd_disc_ref ()

-
void                ogmdvd_disc_ref                     (OGMDvdDisc *disc);
+

ogmdvd_disc_ref ()

+
void                ogmdvd_disc_ref                     (OGMDvdDisc *disc);

-Increments the reference count of an OGMDvdDisc.

+Increments the reference count of an OGMDvdDisc.

- - +
disc : An OGMDvdDisc +

disc :

 An OGMDvdDisc
-

-ogmdvd_disc_unref ()

-
void                ogmdvd_disc_unref                   (OGMDvdDisc *disc);
+

ogmdvd_disc_unref ()

+
void                ogmdvd_disc_unref                   (OGMDvdDisc *disc);

-Decrements the reference count of an OGMDvdDisc.

+Decrements the reference count of an OGMDvdDisc.

- - +
disc : An OGMDvdDisc +

disc :

 An OGMDvdDisc
-

-ogmdvd_disc_get_label ()

-
ogmdvd_disc_get_label ()

+
gchar*              ogmdvd_disc_get_label               (OGMDvdDisc *disc);

+>gchar*              ogmdvd_disc_get_label               (OGMDvdDisc *disc);

Returns the label of the DVD.

@@ -237,12 +235,12 @@ -disc : - An OGMDvdDisc +

disc :

+ An OGMDvdDisc -Returns : +

Returns :

The label of the DVD, or NULL @@ -251,11 +249,37 @@
-

-ogmdvd_disc_get_device ()

-
ogmdvd_disc_get_id ()

+
gchar*              ogmdvd_disc_get_id                  (OGMDvdDisc *disc);

+

+Returns a unique 128 bit disc identifier.

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+


disc :
 An OGMDvdDisc
+
Returns :
 The identifier, or NULL
+

+
+
+
+

ogmdvd_disc_get_device ()

+
gchar*              ogmdvd_disc_get_device              (OGMDvdDisc *disc);
+>gchar* ogmdvd_disc_get_device (OGMDvdDisc *disc);

Returns the DVD device.

@@ -265,12 +289,12 @@ -disc : - An OGMDvdDisc +

disc :

+ An OGMDvdDisc -Returns : +

Returns :

The device of the DVD. @@ -279,11 +303,10 @@
-

-ogmdvd_disc_get_vmg_size ()

-
ogmdvd_disc_get_vmg_size ()

+
gint64              ogmdvd_disc_get_vmg_size            (OGMDvdDisc *disc);

+>gint64              ogmdvd_disc_get_vmg_size            (OGMDvdDisc *disc);

Returns the size of the video manager in bytes.

@@ -293,12 +316,12 @@ -disc : - An OGMDvdDisc +

disc :

+ An OGMDvdDisc -Returns : +

Returns :

The size in bytes, or -1 @@ -307,11 +330,10 @@
-

-ogmdvd_disc_get_n_titles ()

-
ogmdvd_disc_get_n_titles ()

+
gint                ogmdvd_disc_get_n_titles            (OGMDvdDisc *disc);

+>gint                ogmdvd_disc_get_n_titles            (OGMDvdDisc *disc);

Returns the number of video titles of this DVD.

@@ -321,12 +343,12 @@ -disc : - An OGMDvdDisc +

disc :

+ An OGMDvdDisc -Returns : +

Returns :

The number of video titles, or -1 @@ -335,9 +357,8 @@
-

-ogmdvd_disc_get_nth_title ()

-
OGMDvdTitle*        ogmdvd_disc_get_nth_title           (OGMDvdDisc *disc,
+
ogmdvd_disc_get_nth_title ()

+
OGMDvdTitle*        ogmdvd_disc_get_nth_title           (OGMDvdDisc *disc,
                                                          guint nr);

@@ -350,24 +371,56 @@
 
 
 
-disc :
- An OGMDvdDisc
+
disc :

+ An OGMDvdDisc
 
 
 
-nr :
+
nr :

  The title number
 
 
 
-Returns :
- The OGMDvdTitle, or NULL
+
Returns :

+ The OGMDvdTitle, or NULL
+
+
+

ogmdvd_disc_get_titles ()

+
GList*              ogmdvd_disc_get_titles              (OGMDvdDisc *disc);
+

+Returns a list of all the titles of disc.

+

+ +

+
++ + + + + + + + + + +

disc :

 An OGMDvdDisc +

Returns :

 A GList, or NULL +
+ +
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-enums.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-enums.html --- ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-enums.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-enums.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + Enumerations - + - + - + - - + + @@ -22,40 +22,37 @@ - +
-

-Enumerations -

-

Enumerations — Public enumerated types used throughout OGMDvd

+

Enumerations

+

Enumerations — Public enumerated types used throughout OGMDvd
-

Synopsis

+

Synopsis

 
 #include <ogmdvd-enums.h>
 
-
-enum                OGMDvdVideoFormat;
-enum                OGMDvdDisplayAspect;
-enum                OGMDvdDisplayFormat;
-enum                OGMDvdAudioFormat;
-enum                OGMDvdAudioChannels;
-enum                OGMDvdAudioQuantization;
-enum                OGMDvdAudioContent;
-enum                OGMDvdSubpContent;
+enum                OGMDvdVideoFormat;
+enum                OGMDvdDisplayAspect;
+enum                OGMDvdDisplayFormat;
+enum                OGMDvdAudioFormat;
+enum                OGMDvdAudioChannels;
+enum                OGMDvdAudioQuantization;
+enum                OGMDvdAudioContent;
+enum                OGMDvdSubpContent;
-

Description

+

Description

@@ -63,11 +60,10 @@

-

Details

+

Details

-

-enum OGMDvdVideoFormat

-
typedef enum
+
enum OGMDvdVideoFormat

+
typedef enum
 {
   OGMDVD_VIDEO_FORMAT_NTSC = 0,
   OGMDVD_VIDEO_FORMAT_PAL  = 1
@@ -82,12 +78,12 @@
 
 
 
-OGMDVD_VIDEO_FORMAT_NTSC
+
OGMDVD_VIDEO_FORMAT_NTSC

  The title is NTSC
 
 
 
-OGMDVD_VIDEO_FORMAT_PAL
+
OGMDVD_VIDEO_FORMAT_PAL

  The title is PAL
 
 
@@ -96,9 +92,8 @@
-

-enum OGMDvdDisplayAspect

-
typedef enum
+
enum OGMDvdDisplayAspect

+
typedef enum
 {
   OGMDVD_DISPLAY_ASPECT_4_3  = 0,
   OGMDVD_DISPLAY_ASPECT_16_9 = 1
@@ -113,12 +108,12 @@
 
 
 
-OGMDVD_DISPLAY_ASPECT_4_3
+
OGMDVD_DISPLAY_ASPECT_4_3

  The title is 4/3
 
 
 
-OGMDVD_DISPLAY_ASPECT_16_9
+
OGMDVD_DISPLAY_ASPECT_16_9

  The title is 16/9
 
 
@@ -127,9 +122,8 @@
-

-enum OGMDvdDisplayFormat

-
typedef enum
+
enum OGMDvdDisplayFormat

+
typedef enum
 {
   OGMDVD_DISPLAY_FORMAT_PS_LETTER = 0,
   OGMDVD_DISPLAY_FORMAT_PAN_SCAN  = 1,
@@ -145,17 +139,17 @@
 
 
 
-OGMDVD_DISPLAY_FORMAT_PS_LETTER
+
OGMDVD_DISPLAY_FORMAT_PS_LETTER

  The title is pan & scan letter
 
 
 
-OGMDVD_DISPLAY_FORMAT_PAN_SCAN
+
OGMDVD_DISPLAY_FORMAT_PAN_SCAN

  The title is is pan & scan
 
 
 
-OGMDVD_DISPLAY_FORMAT_LETTERBOX
+
OGMDVD_DISPLAY_FORMAT_LETTERBOX

  The title is letterbox
 
 
@@ -164,9 +158,8 @@
-

-enum OGMDvdAudioFormat

-
typedef enum
+
enum OGMDvdAudioFormat

+
typedef enum
 {
   OGMDVD_AUDIO_FORMAT_AC3      = 0,
   OGMDVD_AUDIO_FORMAT_MPEG1    = 2,
@@ -185,32 +178,32 @@
 
 
 
-OGMDVD_AUDIO_FORMAT_AC3
+
OGMDVD_AUDIO_FORMAT_AC3

  The stream is in AC3
 
 
 
-OGMDVD_AUDIO_FORMAT_MPEG1
+
OGMDVD_AUDIO_FORMAT_MPEG1

  The stream is in Mpeg-1
 
 
 
-OGMDVD_AUDIO_FORMAT_MPEG2EXT
+
OGMDVD_AUDIO_FORMAT_MPEG2EXT

  The stream is in Mpeg-2 extended
 
 
 
-OGMDVD_AUDIO_FORMAT_LPCM
+
OGMDVD_AUDIO_FORMAT_LPCM

  The stream is in LPCM
 
 
 
-OGMDVD_AUDIO_FORMAT_SDDS
+
OGMDVD_AUDIO_FORMAT_SDDS

  The stream is in SDDS
 
 
 
-OGMDVD_AUDIO_FORMAT_DTS
+
OGMDVD_AUDIO_FORMAT_DTS

  The stream is in DTS
 
 
@@ -219,9 +212,8 @@
-

-enum OGMDvdAudioChannels

-
typedef enum
+
enum OGMDvdAudioChannels

+
typedef enum
 {
   OGMDVD_AUDIO_CHANNELS_MONO      = 0,
   OGMDVD_AUDIO_CHANNELS_STEREO    = 1,
@@ -238,23 +230,23 @@
 
 
 
-OGMDVD_AUDIO_CHANNELS_MONO
- The stream is in mono
+
OGMDVD_AUDIO_CHANNELS_MONO

+ The stream is mono
 
 
 
-OGMDVD_AUDIO_CHANNELS_STEREO
- The stream is in stereo
+
OGMDVD_AUDIO_CHANNELS_STEREO

+ The stream is stereo
 
 
 
-OGMDVD_AUDIO_CHANNELS_SURROUND
- The stream is in surround
+
OGMDVD_AUDIO_CHANNELS_SURROUND

+ The stream is surround
 
 
 
-OGMDVD_AUDIO_CHANNELS_5_1
- The stream is in 5.1
+
OGMDVD_AUDIO_CHANNELS_5_1

+ The stream is 5.1
 
 
 
@@ -262,9 +254,8 @@
-

-enum OGMDvdAudioQuantization

-
typedef enum
+
enum OGMDvdAudioQuantization

+
typedef enum
 {
   OGMDVD_AUDIO_QUANTIZATION_16  = 0,
   OGMDVD_AUDIO_QUANTIZATION_20  = 1,
@@ -281,22 +272,22 @@
 
 
 
-OGMDVD_AUDIO_QUANTIZATION_16
+
OGMDVD_AUDIO_QUANTIZATION_16

  The stream is quantized in 16 bits
 
 
 
-OGMDVD_AUDIO_QUANTIZATION_20
+
OGMDVD_AUDIO_QUANTIZATION_20

  The stream is quantized in 20 bits
 
 
 
-OGMDVD_AUDIO_QUANTIZATION_24
+
OGMDVD_AUDIO_QUANTIZATION_24

  The stream is quantized in 24 bits
 
 
 
-OGMDVD_AUDIO_QUANTIZATION_DRC
+
OGMDVD_AUDIO_QUANTIZATION_DRC

  The stream is quantized in DRC
 
 
@@ -305,9 +296,8 @@
-

-enum OGMDvdAudioContent

-
typedef enum
+
enum OGMDvdAudioContent

+
typedef enum
 {
   OGMDVD_AUDIO_CONTENT_UNDEFINED = 0,
   OGMDVD_AUDIO_CONTENT_NORMAL    = 1,
@@ -325,27 +315,27 @@
 
 
 
-OGMDVD_AUDIO_CONTENT_UNDEFINED
+
OGMDVD_AUDIO_CONTENT_UNDEFINED

  The stream has undefined content
 
 
 
-OGMDVD_AUDIO_CONTENT_NORMAL
+
OGMDVD_AUDIO_CONTENT_NORMAL

  The stream has normal content
 
 
 
-OGMDVD_AUDIO_CONTENT_IMPAIRED
+
OGMDVD_AUDIO_CONTENT_IMPAIRED

  The stream has content for impaired audience
 
 
 
-OGMDVD_AUDIO_CONTENT_COMMENTS1
+
OGMDVD_AUDIO_CONTENT_COMMENTS1

  The stream is a commentary
 
 
 
-OGMDVD_AUDIO_CONTENT_COMMENTS2
+
OGMDVD_AUDIO_CONTENT_COMMENTS2

  The stream is a commentary
 
 
@@ -354,9 +344,8 @@
-

-enum OGMDvdSubpContent

-
typedef enum
+
enum OGMDvdSubpContent

+
typedef enum
 {
   OGMDVD_SUBP_CONTENT_UNDEFINED,
   OGMDVD_SUBP_CONTENT_NORMAL,
@@ -385,82 +374,82 @@
 
 
 
-OGMDVD_SUBP_CONTENT_UNDEFINED
+
OGMDVD_SUBP_CONTENT_UNDEFINED

  The stream has undefined content
 
 
 
-OGMDVD_SUBP_CONTENT_NORMAL
+
OGMDVD_SUBP_CONTENT_NORMAL

  The stream has normal content
 
 
 
-OGMDVD_SUBP_CONTENT_LARGE
+
OGMDVD_SUBP_CONTENT_LARGE

  The stream has large content
 
 
 
-OGMDVD_SUBP_CONTENT_CHILDREN
+
OGMDVD_SUBP_CONTENT_CHILDREN

  The stream has content for children
 
 
 
-OGMDVD_SUBP_CONTENT_RESERVED1
+
OGMDVD_SUBP_CONTENT_RESERVED1

  Reserved
 
 
 
-OGMDVD_SUBP_CONTENT_NORMAL_CC
+
OGMDVD_SUBP_CONTENT_NORMAL_CC

  The stream has normal closed caption content
 
 
 
-OGMDVD_SUBP_CONTENT_LARGE_CC
+
OGMDVD_SUBP_CONTENT_LARGE_CC

  The stream has large closed caption content
 
 
 
-OGMDVD_SUBP_CONTENT_CHILDREN_CC
+
OGMDVD_SUBP_CONTENT_CHILDREN_CC

  The stream has closed caption content for children
 
 
 
-OGMDVD_SUBP_CONTENT_RESERVED2
+
OGMDVD_SUBP_CONTENT_RESERVED2

  Reserved
 
 
 
-OGMDVD_SUBP_CONTENT_FORCED
+
OGMDVD_SUBP_CONTENT_FORCED

  The stream has forced content
 
 
 
-OGMDVD_SUBP_CONTENT_RESERVED3
+
OGMDVD_SUBP_CONTENT_RESERVED3

  Reserved
 
 
 
-OGMDVD_SUBP_CONTENT_RESERVED4
+
OGMDVD_SUBP_CONTENT_RESERVED4

  Reserved
 
 
 
-OGMDVD_SUBP_CONTENT_RESERVED5
+
OGMDVD_SUBP_CONTENT_RESERVED5

  Reserved
 
 
 
-OGMDVD_SUBP_CONTENT_DIRECTOR
+
OGMDVD_SUBP_CONTENT_DIRECTOR

  The stream has director commentary content
 
 
 
-OGMDVD_SUBP_CONTENT_LARGE_DIRECTOR
+
OGMDVD_SUBP_CONTENT_LARGE_DIRECTOR

  The stream has large director commentary content
 
 
 
-OGMDVD_SUBP_CONTENT_CHILDREN_DIRECTOR
+
OGMDVD_SUBP_CONTENT_CHILDREN_DIRECTOR

  The stream has director commentary content for children
 
 
@@ -469,5 +458,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-labels.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-labels.html --- ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-labels.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-labels.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + Conversion functions - + - + - - + + - - + + @@ -20,84 +20,81 @@ - + - +
-

-Conversion functions -

-

Conversion functions — Converts enumerated types into human readable strings

+

Conversion functions

+

Conversion functions — Converts enumerated types into human readable strings
-

Synopsis

+

Synopsis

 
 #include <ogmdvd-labels.h>
 
-
 const gchar*        ogmdvd_get_video_format_label       (gchar*        ogmdvd_get_video_format_label       (gint format);
 const gchar*        ogmdvd_get_display_aspect_label     (gchar*        ogmdvd_get_display_aspect_label     (gint aspect);
 const gchar*        ogmdvd_get_audio_format_label       (gchar*        ogmdvd_get_audio_format_label       (gint format);
 const gchar*        ogmdvd_get_audio_channels_label     (gchar*        ogmdvd_get_audio_channels_label     (gint channels);
 const gchar*        ogmdvd_get_audio_quantization_label (gchar*        ogmdvd_get_audio_quantization_label (gint quantization);
 const gchar*        ogmdvd_get_audio_content_label      (gchar*        ogmdvd_get_audio_content_label      (gint content);
 const gchar*        ogmdvd_get_subp_content_label       (gchar*        ogmdvd_get_subp_content_label       (gint content);
 const gchar*        ogmdvd_get_language_label           (gchar*        ogmdvd_get_language_label           (gint code);
 const gchar*        ogmdvd_get_language_iso639_1        (gchar*        ogmdvd_get_language_iso639_1        (gint code);
 const gchar*        ogmdvd_get_language_iso639_2        (gchar*        ogmdvd_get_language_iso639_2        (gint code);
-

Description

+

Description

@@ -105,11 +102,10 @@

-

Details

+

Details

-

-ogmdvd_get_video_format_label ()

-
const 
ogmdvd_get_video_format_label ()

+
const gchar*        ogmdvd_get_video_format_label       (
 
 
-format :
+
format :

  The video format
 
 
 
-Returns :
+
Returns :

  A constant string, or NULL
 
 
@@ -137,9 +133,8 @@
-

-ogmdvd_get_display_aspect_label ()

-
const 
ogmdvd_get_display_aspect_label ()

+
const gchar*        ogmdvd_get_display_aspect_label     (
 
 
-aspect :
+
aspect :

  The display aspect
 
 
 
-Returns :
+
Returns :

  A constant string, or NULL
 
 
@@ -167,9 +162,8 @@
-

-ogmdvd_get_audio_format_label ()

-
const 
ogmdvd_get_audio_format_label ()

+
const gchar*        ogmdvd_get_audio_format_label       (
 
 
-format :
+
format :

  The audio format
 
 
 
-Returns :
+
Returns :

  A constant string, or NULL
 
 
@@ -197,9 +191,8 @@
-

-ogmdvd_get_audio_channels_label ()

-
const 
ogmdvd_get_audio_channels_label ()

+
const gchar*        ogmdvd_get_audio_channels_label     (
 
 
-channels :
+
channels :

  The number of channels
 
 
 
-Returns :
+
Returns :

  A constant string, or NULL
 
 
@@ -227,9 +220,8 @@
-

-ogmdvd_get_audio_quantization_label ()

-
const 
ogmdvd_get_audio_quantization_label ()

+
const gchar*        ogmdvd_get_audio_quantization_label (
 
 
-quantization :
+
quantization :

  The quantization
 
 
 
-Returns :
+
Returns :

  A constant string, or NULL
 
 
@@ -257,9 +249,8 @@
-

-ogmdvd_get_audio_content_label ()

-
const 
ogmdvd_get_audio_content_label ()

+
const gchar*        ogmdvd_get_audio_content_label      (
 
 
-content :
+
content :

  The audio content
 
 
 
-Returns :
+
Returns :

  A constant string, or NULL
 
 
@@ -287,9 +278,8 @@
-

-ogmdvd_get_subp_content_label ()

-
const 
ogmdvd_get_subp_content_label ()

+
const gchar*        ogmdvd_get_subp_content_label       (
 
 
-content :
+
content :

  The subtitles content
 
 
 
-Returns :
+
Returns :

  A constant string, or NULL
 
 
@@ -317,9 +307,8 @@
-

-ogmdvd_get_language_label ()

-
const 
ogmdvd_get_language_label ()

+
const gchar*        ogmdvd_get_language_label           (
 
 
-code :
+
code :

  The language code
 
 
 
-Returns :
+
Returns :

  A constant string, or NULL
 
 
@@ -347,9 +336,8 @@
-

-ogmdvd_get_language_iso639_1 ()

-
const 
ogmdvd_get_language_iso639_1 ()

+
const gchar*        ogmdvd_get_language_iso639_1        (
 
 
-code :
+
code :

  The language code
 
 
 
-Returns :
+
Returns :

  A constant string, or NULL
 
 
@@ -377,9 +365,8 @@
-

-ogmdvd_get_language_iso639_2 ()

-
const 
ogmdvd_get_language_iso639_2 ()

+
const gchar*        ogmdvd_get_language_iso639_2        (
 
 
-code :
+
code :

  The language code
 
 
 
-Returns :
+
Returns :

  A constant string, or NULL
 
 
@@ -407,5 +394,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-parser.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-parser.html --- ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-parser.html 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-parser.html 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,307 @@ + + + + +Parser + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

Parser

+

Parser — Parses the content of a DVD

+
+
+

Synopsis

+
+
+#include <ogmdvd-parser.h>
+
+enum                OGMDvdParserStatus;
+OGMDvdParser*       ogmdvd_parser_new                   (OGMDvdTitle *title);
+void                ogmdvd_parser_ref                   (OGMDvdParser *parser);
+void                ogmdvd_parser_unref                 (OGMDvdParser *parser);
+gint                ogmdvd_parser_analyze               (OGMDvdParser *parser,
+                                                         guchar *buffer);
+gint                ogmdvd_parser_get_max_frames        (OGMDvdParser *parser);
+void                ogmdvd_parser_set_max_frames        (OGMDvdParser *parser,
+                                                         gint max_frames);
+gint                ogmdvd_parser_get_audio_bitrate     (OGMDvdParser *parser,
+                                                         guint nr);
+
+
+
+

Description

+

+

+

+ +

+
+
+

Details

+
+

enum OGMDvdParserStatus

+
typedef enum
+{
+  OGMDVD_PARSER_STATUS_NONE,
+  OGMDVD_PARSER_STATUS_BITRATES,
+  OGMDVD_PARSER_STATUS_MAX_FRAMES
+} OGMDvdParserStatus;
+
+

+Status code returned by ogmdvd_parser_analyze()

+

+ +

+
++ + + + + + + + + + + + + + +

OGMDVD_PARSER_STATUS_NONE

 There is no information available yet +

OGMDVD_PARSER_STATUS_BITRATES

 The bitrates of all the audio tracks are available +

OGMDVD_PARSER_STATUS_MAX_FRAMES

 The maximum number of frames has been reached +
+
+
+
+

ogmdvd_parser_new ()

+
OGMDvdParser*       ogmdvd_parser_new                   (OGMDvdTitle *title);
+

+Creates a new OGMDvdParser.

+

+ +

+
++ + + + + + + + + + +

title :

 An OGMDvdTitle +

Returns :

 The new OGMDvdParser, or NULL +
+
+
+
+

ogmdvd_parser_ref ()

+
void                ogmdvd_parser_ref                   (OGMDvdParser *parser);
+

+Increments the reference count of an OGMDvdParser.

+

+ +

+
++ + + + +

parser :

 An OGMDvdParser +
+
+
+
+

ogmdvd_parser_unref ()

+
void                ogmdvd_parser_unref                 (OGMDvdParser *parser);
+

+Decrements the reference count of an OGMDvdParser.

+

+ +

+
++ + + + +

parser :

 An OGMDvdParser +
+
+
+
+

ogmdvd_parser_analyze ()

+
gint                ogmdvd_parser_analyze               (OGMDvdParser *parser,
+                                                         guchar *buffer);
+

+Analyzes the block contained in buffer.

+

+ +

+
++ + + + + + + + + + + + + + +

parser :

 An OGMDvdParser +

buffer :

 A buffer containing a block to analyze +

Returns :

 the status of the analysis +
+
+
+
+

ogmdvd_parser_get_max_frames ()

+
gint                ogmdvd_parser_get_max_frames        (OGMDvdParser *parser);
+

+Returns the maximum number of frames to analyze.

+

+ +

+
++ + + + + + + + + + +

parser :

 An OGMDvdParser +

Returns :

 The number of frames, -1 if the whole title is to be analyzed, 0 on error +
+
+
+
+

ogmdvd_parser_set_max_frames ()

+
void                ogmdvd_parser_set_max_frames        (OGMDvdParser *parser,
+                                                         gint max_frames);
+

+Sets the maximum number of frames to analyse. If max_frames is negative, +all the frames of the title will be analyzed.

+

+ +

+
++ + + + + + + + + + +

parser :

 An OGMDvdParser +

max_frames :

 A number of frames +
+
+
+
+

ogmdvd_parser_get_audio_bitrate ()

+
gint                ogmdvd_parser_get_audio_bitrate     (OGMDvdParser *parser,
+                                                         guint nr);
+

+Returns the bitrate of the audio stream at position nr, starting at 0.

+

+ +

+
++ + + + + + + + + + + + + + +

parser :

 An OGMDvdParser +

nr :

 The audio stream number +

Returns :

 The bitrate, or -1 +
+
+
+
+
+
+ Generated by GTK-Doc V1.10
+ + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-reader.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-reader.html --- ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-reader.html 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-reader.html 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,269 @@ + + + + +Reader + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

Reader

+

Reader — Reads the content of a DVD

+
+
+

Synopsis

+
+
+#include <ogmdvd-reader.h>
+
+OGMDvdReader*       ogmdvd_reader_new                   (OGMDvdTitle *title,
+                                                         guint start_chap,
+                                                         gint end_chap,
+                                                         guint angle);
+OGMDvdReader*       ogmdvd_reader_new_by_cells          (OGMDvdTitle *title,
+                                                         guint start_cell,
+                                                         gint end_cell,
+                                                         guint angle);
+void                ogmdvd_reader_ref                   (OGMDvdReader *reader);
+void                ogmdvd_reader_unref                 (OGMDvdReader *reader);
+gint                ogmdvd_reader_get_block             (OGMDvdReader *reader,
+                                                         gsize len,
+                                                         guchar *buffer);
+
+
+
+

Description

+

+

+

+ +

+
+
+

Details

+
+

ogmdvd_reader_new ()

+
OGMDvdReader*       ogmdvd_reader_new                   (OGMDvdTitle *title,
+                                                         guint start_chap,
+                                                         gint end_chap,
+                                                         guint angle);
+

+Creates a new OGMDvdReader.

+

+ +

+
++ + + + + + + + + + + + + + + + + + + + + + +

title :

 An OGMDvdTitle +

start_chap :

 The chapter to start reading at, 0 for the first chapter +

end_chap :

 The chapter to stop reading at, -1 for the last chapter +

angle :

 The angle to read +

Returns :

 The new OGMDvdReader, or NULL +
+
+
+
+

ogmdvd_reader_new_by_cells ()

+
OGMDvdReader*       ogmdvd_reader_new_by_cells          (OGMDvdTitle *title,
+                                                         guint start_cell,
+                                                         gint end_cell,
+                                                         guint angle);
+

+Creates a new OGMDvdReader.

+

+ +

+
++ + + + + + + + + + + + + + + + + + + + + + +

title :

 An OGMDvdTitle +

start_cell :

 The cell to start reading at, 0 for the first cell +

end_cell :

 The cell to stop reading at, -1 for the last cell +

angle :

 The angle to read +

Returns :

 The new OGMDvdReader, or NULL +
+
+
+
+

ogmdvd_reader_ref ()

+
void                ogmdvd_reader_ref                   (OGMDvdReader *reader);
+

+Increments the reference count of an OGMDvdReader.

+

+ +

+
++ + + + +

reader :

 An OGMDvdReader +
+
+
+
+

ogmdvd_reader_unref ()

+
void                ogmdvd_reader_unref                 (OGMDvdReader *reader);
+

+Decrements the reference count of an OGMDvdReader.

+

+ +

+
++ + + + +

reader :

 An OGMDvdReader +
+
+
+
+

ogmdvd_reader_get_block ()

+
gint                ogmdvd_reader_get_block             (OGMDvdReader *reader,
+                                                         gsize len,
+                                                         guchar *buffer);
+

+Reads up to len blocks from the DVD into the buffer starting at buffer.

+

+ +

+
++ + + + + + + + + + + + + + + + + + +

reader :

 An OGMDvdReader +

len :

 The number of blocks to read +

buffer :

 The buffer to store the blocks read +

Returns :

 The number of blocks read, or -1 +
+
+
+
+
+
+ Generated by GTK-Doc V1.10
+ + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-stream.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-stream.html --- ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-stream.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-stream.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + OGMDvdStream - + - + - + - - + + @@ -22,38 +22,38 @@ - +
-

-OGMDvdStream -

-

OGMDvdStream — Structure describing a stream

+

OGMDvdStream

+

OGMDvdStream — Structure describing a stream
-

Synopsis

+

Synopsis

 
 #include <ogmdvd-stream.h>
 
-
-void                ogmdvd_stream_ref                   (OGMDvdStream *stream);
-void                ogmdvd_stream_unref                 (OGMDvdStream *stream);
-OGMDvdTitle*        ogmdvd_stream_get_title             (OGMDvdStream *stream);
+void                ogmdvd_stream_ref                   (OGMDvdStream *stream);
+void                ogmdvd_stream_unref                 (OGMDvdStream *stream);
+OGMDvdTitle*        ogmdvd_stream_get_title             (OGMDvdStream *stream);
+gint                ogmdvd_stream_get_id                (OGMDvdStream *stream);
 gint                ogmdvd_stream_get_nr                (OGMDvdStream *stream);
+>gint                ogmdvd_stream_get_nr                (OGMDvdStream *stream);
-

Description

+

Description

@@ -61,51 +61,48 @@

-

Details

+

Details

-

-ogmdvd_stream_ref ()

-
void                ogmdvd_stream_ref                   (OGMDvdStream *stream);
+

ogmdvd_stream_ref ()

+
void                ogmdvd_stream_ref                   (OGMDvdStream *stream);

-Increments the reference count of an OGMDvdStream.

+Increments the reference count of an OGMDvdStream.

- - +
stream : An OGMDvdStream +

stream :

 An OGMDvdStream
-

-ogmdvd_stream_unref ()

-
void                ogmdvd_stream_unref                 (OGMDvdStream *stream);
+

ogmdvd_stream_unref ()

+
void                ogmdvd_stream_unref                 (OGMDvdStream *stream);

-Decrements the reference count of an OGMDvdStream.

+Decrements the reference count of an OGMDvdStream.

- - +
stream : An OGMDvdStream +

stream :

 An OGMDvdStream
-

-ogmdvd_stream_get_title ()

-
OGMDvdTitle*        ogmdvd_stream_get_title             (OGMDvdStream *stream);
+

ogmdvd_stream_get_title ()

+
OGMDvdTitle*        ogmdvd_stream_get_title             (OGMDvdStream *stream);

-Returns the title the OGMDvdStream belongs to

+Returns the title the OGMDvdStream belongs to

@@ -113,13 +110,13 @@ -stream : - An OGMDvdStream +

stream :

+ An OGMDvdStream -Returns : - An OGMDvdTitle, or NULL +

Returns :

+ An OGMDvdTitle, or NULL @@ -127,11 +124,37 @@
-

-ogmdvd_stream_get_nr ()

-
ogmdvd_stream_get_id ()

+
gint                ogmdvd_stream_get_nr                (OGMDvdStream *stream);

+>gint                ogmdvd_stream_get_id                (OGMDvdStream *stream);
+

+Returns the stream identifier.

+

+ +

+
++ + + + + + + + + + +

stream :

 An OGMDvdStream +

Returns :

 The stream identifier, or -1 +
+
+
+
+

ogmdvd_stream_get_nr ()

+
gint                ogmdvd_stream_get_nr                (OGMDvdStream *stream);

Returns the stream number.

@@ -141,12 +164,12 @@ -stream : - An OGMDvdStream +

stream :

+ An OGMDvdStream -Returns : +

Returns :

The stream number, or -1 @@ -155,5 +178,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-subp.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-subp.html --- ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-subp.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-subp.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,16 +1,16 @@ - + OGMDvdSubp - + - + - + - - + + @@ -19,40 +19,37 @@ - + - +
-

-OGMDvdSubp -

-

OGMDvdSubp — Structure describing a subtitles stream

+

OGMDvdSubp

+

OGMDvdSubp — Structure describing a subtitles stream
-

Synopsis

+

Synopsis

 
 #include <ogmdvd-subp.h>
 
-
 gint                ogmdvd_subp_stream_get_language     (OGMDvdSubpStream *subp);
+>gint                ogmdvd_subp_stream_get_language     (OGMDvdSubpStream *subp);
 gint                ogmdvd_subp_stream_get_content      (OGMDvdSubpStream *subp);
+>gint                ogmdvd_subp_stream_get_content      (OGMDvdSubpStream *subp);
-

Description

+

Description

@@ -60,13 +57,12 @@

-

Details

+

Details

-

-ogmdvd_subp_stream_get_language ()

-
ogmdvd_subp_stream_get_language ()

+
gint                ogmdvd_subp_stream_get_language     (OGMDvdSubpStream *subp);

+>gint                ogmdvd_subp_stream_get_language     (OGMDvdSubpStream *subp);

Returns the language of the subtitles stream.

@@ -76,12 +72,12 @@ -subp : - An OGMDvdSubpStream +

subp :

+ An OGMDvdSubpStream -Returns : +

Returns :

The language code, or -1 @@ -90,11 +86,10 @@
-

-ogmdvd_subp_stream_get_content ()

-
ogmdvd_subp_stream_get_content ()

+
gint                ogmdvd_subp_stream_get_content      (OGMDvdSubpStream *subp);

+>gint                ogmdvd_subp_stream_get_content      (OGMDvdSubpStream *subp);

Returns the content of the subtitles stream.

@@ -104,13 +99,13 @@ -subp : - An OGMDvdSubpStream +

subp :

+ An OGMDvdSubpStream -Returns : - OGMDvdSubpContent, or -1 +

Returns :

+ OGMDvdSubpContent, or -1 @@ -118,5 +113,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-title.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-title.html --- ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-title.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-title.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + OGMDvdTitle - + - + - + - - + + @@ -22,44 +22,44 @@ - +
-

-OGMDvdTitle -

-

OGMDvdTitle — Structure describing a DVD title

+

OGMDvdTitle

+

OGMDvdTitle — Structure describing a DVD title
-

Synopsis

+

Synopsis

 
 #include <ogmdvd-title.h>
 
-
-void                ogmdvd_title_ref                    (OGMDvdTitle *title);
-void                ogmdvd_title_unref                  (OGMDvdTitle *title);
-OGMDvdDisc*         ogmdvd_title_get_disc               (OGMDvdTitle *title);
+void                ogmdvd_title_ref                    (OGMDvdTitle *title);
+void                ogmdvd_title_unref                  (OGMDvdTitle *title);
+gboolean            ogmdvd_title_analyze                (OGMDvdTitle *title);
+OGMDvdDisc*         ogmdvd_title_get_disc               (OGMDvdTitle *title);
 gint64              ogmdvd_title_get_vts_size           (OGMDvdTitle *title);
+>gint64              ogmdvd_title_get_vts_size           (OGMDvdTitle *title);
 gint                ogmdvd_title_get_nr                 (OGMDvdTitle *title);
+>gint                ogmdvd_title_get_nr                 (OGMDvdTitle *title);
 gdouble             ogmdvd_title_get_length             (OGMDvdTitle *title,
+>gdouble             ogmdvd_title_get_length             (OGMDvdTitle *title,
                                                          OGMDvdTime *length);
 gdouble             ogmdvd_title_get_chapters_length    (OGMDvdTitle *title,
+>gdouble             ogmdvd_title_get_chapters_length    (OGMDvdTitle *title,
                                                          guint start,
@@ -67,14 +67,14 @@
 href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
 >gint end,
                                                          OGMDvdTime *length);
-void                ogmdvd_title_get_framerate          (OGMDvdTitle *title,
+void                ogmdvd_title_get_framerate          (OGMDvdTitle *title,
                                                          guint *numerator,
                                                          guint *denominator);
-void                ogmdvd_title_get_size               (OGMDvdTitle *title,
+void                ogmdvd_title_get_size               (OGMDvdTitle *title,
                                                          guint *width,
@@ -83,37 +83,43 @@
 >guint *height);
 gint                ogmdvd_title_get_video_format       (OGMDvdTitle *title);
+>gint                ogmdvd_title_get_video_format       (OGMDvdTitle *title);
 gint                ogmdvd_title_get_display_aspect     (OGMDvdTitle *title);
+>gint                ogmdvd_title_get_display_aspect     (OGMDvdTitle *title);
 gint                ogmdvd_title_get_display_format     (OGMDvdTitle *title);
+>gint                ogmdvd_title_get_display_format     (OGMDvdTitle *title);
 guint*              ogmdvd_title_get_palette            (OGMDvdTitle *title);
+>guint*              ogmdvd_title_get_palette            (OGMDvdTitle *title);
 gint                ogmdvd_title_get_n_angles           (OGMDvdTitle *title);
+>gint                ogmdvd_title_get_n_angles           (OGMDvdTitle *title);
 gint                ogmdvd_title_get_n_chapters         (OGMDvdTitle *title);
+>gint                ogmdvd_title_get_n_chapters         (OGMDvdTitle *title);
 gint                ogmdvd_title_get_n_audio_streams    (OGMDvdTitle *title);
-OGMDvdAudioStream*  ogmdvd_title_get_nth_audio_stream   (OGMDvdTitle *title,
+>gint                ogmdvd_title_get_n_audio_streams    (OGMDvdTitle *title);
+OGMDvdAudioStream*  ogmdvd_title_get_nth_audio_stream   (OGMDvdTitle *title,
                                                          guint nr);
 GList*              ogmdvd_title_get_audio_streams      (OGMDvdTitle *title);
+gint                ogmdvd_title_get_n_subp_streams     (OGMDvdTitle *title);
-OGMDvdSubpStream*   ogmdvd_title_get_nth_subp_stream    (OGMDvdTitle *title,
+>gint                ogmdvd_title_get_n_subp_streams     (OGMDvdTitle *title);
+OGMDvdSubpStream*   ogmdvd_title_get_nth_subp_stream    (OGMDvdTitle *title,
                                                          guint nr);
-void                ogmdvd_title_get_aspect_ratio       (OGMDvdTitle *title,
+GList*              ogmdvd_title_get_subp_streams       (OGMDvdTitle *title);
+void                ogmdvd_title_get_aspect_ratio       (OGMDvdTitle *title,
                                                          guint *numerator,
@@ -123,7 +129,7 @@
-

Description

+

Description

@@ -131,51 +137,77 @@

-

Details

+

Details

-

-ogmdvd_title_ref ()

-
void                ogmdvd_title_ref                    (OGMDvdTitle *title);
+

ogmdvd_title_ref ()

+
void                ogmdvd_title_ref                    (OGMDvdTitle *title);

-Increments the reference count of an OGMDvdTitle.

+Increments the reference count of an OGMDvdTitle.

- - +
title : An OGMDvdTitle +

title :

 An OGMDvdTitle
-

-ogmdvd_title_unref ()

-
void                ogmdvd_title_unref                  (OGMDvdTitle *title);
+

ogmdvd_title_unref ()

+
void                ogmdvd_title_unref                  (OGMDvdTitle *title);

-Decrements the reference count of an OGMDvdTitle.

+Decrements the reference count of an OGMDvdTitle.

- - +
title : An OGMDvdTitle +

title :

 An OGMDvdTitle
-

-ogmdvd_title_get_disc ()

-
OGMDvdDisc*         ogmdvd_title_get_disc               (OGMDvdTitle *title);
+

ogmdvd_title_analyze ()

+
gboolean            ogmdvd_title_analyze                (OGMDvdTitle *title);
+

+Performs a depper analysis of the title to get more information about it and +its audio and subtitle streams. This function should be called multipled timeѕ +until the analysis is complete.

+

+ +

+
++ + + + + + + + + + +

title :

 An OGMDvdTitle +

Returns :

 FALSE if the analysis if complete, TRUE otherwise +
+
+
+
+

ogmdvd_title_get_disc ()

+
OGMDvdDisc*         ogmdvd_title_get_disc               (OGMDvdTitle *title);

-Returns the disc the OGMDvdTitle was opened from.

+Returns the disc the OGMDvdTitle was opened from.

@@ -183,13 +215,13 @@ -title : - An OGMDvdTitle +

title :

+ An OGMDvdTitle -Returns : - The OGMDvdDisc, or NULL +

Returns :

+ The OGMDvdDisc, or NULL @@ -197,11 +229,10 @@
-

-ogmdvd_title_get_vts_size ()

-
ogmdvd_title_get_vts_size ()

+
gint64              ogmdvd_title_get_vts_size           (OGMDvdTitle *title);

+>gint64              ogmdvd_title_get_vts_size           (OGMDvdTitle *title);

Returns the size of the video title set in bytes.

@@ -211,12 +242,12 @@ -title : - An OGMDvdTitle +

title :

+ An OGMDvdTitle -Returns : +

Returns :

The size in bytes, or -1 @@ -225,11 +256,10 @@
-

-ogmdvd_title_get_nr ()

-
ogmdvd_title_get_nr ()

+
gint                ogmdvd_title_get_nr                 (OGMDvdTitle *title);

+>gint                ogmdvd_title_get_nr                 (OGMDvdTitle *title);

Returns the title number.

@@ -239,12 +269,12 @@ -title : - An OGMDvdTitle +

title :

+ An OGMDvdTitle -Returns : +

Returns :

The title number, or -1 @@ -253,11 +283,10 @@
-

-ogmdvd_title_get_length ()

-
ogmdvd_title_get_length ()

+
gdouble             ogmdvd_title_get_length             (OGMDvdTitle *title,
+>gdouble             ogmdvd_title_get_length             (OGMDvdTitle *title,
                                                          OGMDvdTime *length);

 

 Returns the title length in seconds. If length is not NULL, the data
@@ -270,17 +299,17 @@
 
 
 
-title :
- An OGMDvdTitle
+
title :

+ An OGMDvdTitle
 
 
 
-length :
+
length :

  A pointer to set the OGMDvdTime, or NULL
 
 
 
-Returns :
+
Returns :

  The length in seconds, or -1.0
 
 
@@ -289,11 +318,10 @@
-

-ogmdvd_title_get_chapters_length ()

-
ogmdvd_title_get_chapters_length ()

+
gdouble             ogmdvd_title_get_chapters_length    (OGMDvdTitle *title,
+>gdouble             ogmdvd_title_get_chapters_length    (OGMDvdTitle *title,
                                                          guint start,
@@ -312,27 +340,27 @@
 
 
 
-title :
- An OGMDvdTitle
+
title :

+ An OGMDvdTitle
 
 
 
-start :
+
start :

  The start chapter
 
 
 
-end :
+
end :

  The end chapter
 
 
 
-length :
+
length :

  A pointer to set the OGMDvdTime, or NULL
 
 
 
-Returns :
+
Returns :

  The length in seconds, or -1.0
 
 
@@ -341,9 +369,8 @@
-

-ogmdvd_title_get_framerate ()

-
void                ogmdvd_title_get_framerate          (OGMDvdTitle *title,
+
ogmdvd_title_get_framerate ()

+
void                ogmdvd_title_get_framerate          (OGMDvdTitle *title,
                                                          guint *numerator,
@@ -359,17 +386,17 @@
 
 
 
-title :
- An OGMDvdTitle
+
title :

+ An OGMDvdTitle
 
 
 
-numerator :
+
numerator :

  A pointer to set the framerate numerator, or NULL
 
 
 
-denominator :
+
denominator :

  A pointer to set the framerate denominator, or NULL
 
 
@@ -378,9 +405,8 @@
-

-ogmdvd_title_get_size ()

-
void                ogmdvd_title_get_size               (OGMDvdTitle *title,
+
ogmdvd_title_get_size ()

+
void                ogmdvd_title_get_size               (OGMDvdTitle *title,
                                                          guint *width,
@@ -396,17 +422,17 @@
 
 
 
-title :
- An OGMDvdTitle
+
title :

+ An OGMDvdTitle
 
 
 
-width :
+
width :

  A pointer to set the width of the picture, or NULL
 
 
 
-height :
+
height :

  A pointer to set the height of the picture, or NULL
 
 
@@ -415,11 +441,10 @@
-

-ogmdvd_title_get_video_format ()

-
ogmdvd_title_get_video_format ()

+
gint                ogmdvd_title_get_video_format       (OGMDvdTitle *title);

+>gint                ogmdvd_title_get_video_format       (OGMDvdTitle *title);

Returns the video format of the movie.

@@ -429,13 +454,13 @@ -title : - An OGMDvdTitle +

title :

+ An OGMDvdTitle -Returns : - OGMDvdVideoFormat, or -1 +

Returns :

+ OGMDvdVideoFormat, or -1 @@ -443,11 +468,10 @@
-

-ogmdvd_title_get_display_aspect ()

-
ogmdvd_title_get_display_aspect ()

+
gint                ogmdvd_title_get_display_aspect     (OGMDvdTitle *title);

+>gint                ogmdvd_title_get_display_aspect     (OGMDvdTitle *title);

Returns the display aspect of the movie.

@@ -457,13 +481,13 @@ -title : - An OGMDvdTitle +

title :

+ An OGMDvdTitle -Returns : - OGMDvdDisplayAspect, or -1 +

Returns :

+ OGMDvdDisplayAspect, or -1 @@ -471,11 +495,10 @@
-

-ogmdvd_title_get_display_format ()

-
ogmdvd_title_get_display_format ()

+
gint                ogmdvd_title_get_display_format     (OGMDvdTitle *title);

+>gint                ogmdvd_title_get_display_format     (OGMDvdTitle *title);

Returns the display format of the movie.

@@ -485,13 +508,13 @@ -title : - An OGMDvdTitle +

title :

+ An OGMDvdTitle -Returns : - OGMDvdDisplayFormat, or -1 +

Returns :

+ OGMDvdDisplayFormat, or -1 @@ -499,11 +522,10 @@
-

-ogmdvd_title_get_palette ()

-
ogmdvd_title_get_palette ()

+
guint*              ogmdvd_title_get_palette            (OGMDvdTitle *title);

+>guint*              ogmdvd_title_get_palette            (OGMDvdTitle *title);

Returns the palette of the movie.

@@ -513,12 +535,12 @@ -title : - An OGMDvdTitle +

title :

+ An OGMDvdTitle -Returns : +

Returns :

a constant array of 16 integers, or NULL @@ -527,11 +549,10 @@
-

-ogmdvd_title_get_n_angles ()

-
ogmdvd_title_get_n_angles ()

+
gint                ogmdvd_title_get_n_angles           (OGMDvdTitle *title);

+>gint                ogmdvd_title_get_n_angles           (OGMDvdTitle *title);

Returns the number of angles of the video title.

@@ -541,12 +562,12 @@ -title : - An OGMDvdTitle +

title :

+ An OGMDvdTitle -Returns : +

Returns :

The number of angles, or -1 @@ -555,11 +576,10 @@
-

-ogmdvd_title_get_n_chapters ()

-
ogmdvd_title_get_n_chapters ()

+
gint                ogmdvd_title_get_n_chapters         (OGMDvdTitle *title);

+>gint                ogmdvd_title_get_n_chapters         (OGMDvdTitle *title);

Returns the number of chapters of the video title.

@@ -569,12 +589,12 @@ -title : - An OGMDvdTitle +

title :

+ An OGMDvdTitle -Returns : +

Returns :

The number of chapters, or -1 @@ -583,11 +603,10 @@
-

-ogmdvd_title_get_n_audio_streams ()

-
ogmdvd_title_get_n_audio_streams ()

+
gint                ogmdvd_title_get_n_audio_streams    (OGMDvdTitle *title);

+>gint                ogmdvd_title_get_n_audio_streams    (OGMDvdTitle *title);

Returns the number of audio streams of the video title.

@@ -597,12 +616,12 @@ -title : - An OGMDvdTitle +

title :

+ An OGMDvdTitle -Returns : +

Returns :

The number of audio streams, or -1 @@ -611,9 +630,8 @@
-

-ogmdvd_title_get_nth_audio_stream ()

-
OGMDvdAudioStream*  ogmdvd_title_get_nth_audio_stream   (OGMDvdTitle *title,
+
ogmdvd_title_get_nth_audio_stream ()

+
OGMDvdAudioStream*  ogmdvd_title_get_nth_audio_stream   (OGMDvdTitle *title,
                                                          guint nr);

@@ -626,18 +644,18 @@
 
 
 
-title :
- An OGMDvdTitle
+
title :

+ An OGMDvdTitle
 
 
 
-nr :
+
nr :

  The audio stream number
 
 
 
-Returns :
- The OGMDvdAudioStream, or NULL
+
Returns :

+ The OGMDvdAudioStream, or NULL
 
 
 
@@ -645,11 +663,39 @@
-

-ogmdvd_title_get_n_subp_streams ()

-
ogmdvd_title_get_audio_streams ()

+
GList*              ogmdvd_title_get_audio_streams      (OGMDvdTitle *title);

+

+Returns a list of audio stream.

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+


title :
 An OGMDvdTitle
+
Returns :
 The GList, or NULL
+

+
+
+
+

ogmdvd_title_get_n_subp_streams ()

+
gint                ogmdvd_title_get_n_subp_streams     (OGMDvdTitle *title);
+>gint ogmdvd_title_get_n_subp_streams (OGMDvdTitle *title);

Returns the number of subtitles streams of the video title.

@@ -659,12 +705,12 @@ -title : - An OGMDvdTitle +

title :

+ An OGMDvdTitle -Returns : +

Returns :

The number of subtitles streams, or -1 @@ -673,9 +719,8 @@
-

-ogmdvd_title_get_nth_subp_stream ()

-
OGMDvdSubpStream*   ogmdvd_title_get_nth_subp_stream    (OGMDvdTitle *title,
+
ogmdvd_title_get_nth_subp_stream ()

+
OGMDvdSubpStream*   ogmdvd_title_get_nth_subp_stream    (OGMDvdTitle *title,
                                                          guint nr);

@@ -688,18 +733,18 @@
 
 
 
-title :
- An OGMDvdTitle
+
title :

+ An OGMDvdTitle
 
 
 
-nr :
+
nr :

  The subtitles stream number
 
 
 
-Returns :
- The OGMDvdSubpStream, or NULL
+
Returns :

+ The OGMDvdSubpStream, or NULL
 
 
 
@@ -707,9 +752,37 @@
-

-ogmdvd_title_get_aspect_ratio ()

-
void                ogmdvd_title_get_aspect_ratio       (OGMDvdTitle *title,
+
ogmdvd_title_get_subp_streams ()

+
GList*              ogmdvd_title_get_subp_streams       (OGMDvdTitle *title);

+

+Returns a list of subp stream.

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+


title :
 An OGMDvdTitle
+
Returns :
 The GList, or NULL
+

+
+
+
+

ogmdvd_title_get_aspect_ratio ()

+
void                ogmdvd_title_get_aspect_ratio       (OGMDvdTitle *title,
                                                          guint *numerator,
@@ -725,17 +798,17 @@
 
 
 
-title :
- An OGMDvdTitle
+
title :

+ An OGMDvdTitle
 
 
 
-numerator :
+
numerator :

  A pointer to set the aspect ratio numerator, or NULL
 
 
 
-denominator :
+
denominator :

  A pointer to set the aspect ratio denominator, or NULL
 
 
@@ -744,5 +817,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-types.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-types.html --- ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-types.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ogmdvd-types.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + Types - + - - + + - + - - + + @@ -22,37 +22,36 @@ - +
-

-Types -

-

Types — Public data structures used throughout OGMDvd

+

Types

+

Types — Public data structures used throughout OGMDvd
-

Synopsis

+

Synopsis

 
 #include <ogmdvd-types.h>
 
-
-                    OGMDvdDisc;
-                    OGMDvdTitle;
-                    OGMDvdStream;
-                    OGMDvdAudioStream;
-                    OGMDvdSubpStream;
+                    OGMDvdDisc;
+                    OGMDvdTitle;
+                    OGMDvdStream;
+                    OGMDvdAudioStream;
+                    OGMDvdSubpStream;
+                    OGMDvdReader;
+                    OGMDvdParser;
-

Description

+

Description

@@ -60,11 +59,10 @@

-

Details

+

Details

-

-OGMDvdDisc

-
typedef struct _OGMDvdDisc OGMDvdDisc;
+

OGMDvdDisc

+
typedef struct _OGMDvdDisc OGMDvdDisc;

An opaque structure representing a DVD disc

@@ -73,9 +71,8 @@

-

-OGMDvdTitle

-
typedef struct _OGMDvdTitle OGMDvdTitle;
+

OGMDvdTitle

+
typedef struct _OGMDvdTitle OGMDvdTitle;

An opaque structure representing a DVD title

@@ -84,9 +81,8 @@

-

-OGMDvdStream

-
typedef struct _OGMDvdStream OGMDvdStream;
+

OGMDvdStream

+
typedef struct _OGMDvdStream OGMDvdStream;

An opaque structure representing a DVD stream

@@ -95,9 +91,8 @@

-

-OGMDvdAudioStream

-
typedef struct _OGMDvdAudioStream OGMDvdAudioStream;
+

OGMDvdAudioStream

+
typedef struct _OGMDvdAudioStream OGMDvdAudioStream;

An opaque structure representing a DVD audio stream

@@ -106,16 +101,38 @@

-

-OGMDvdSubpStream

-
typedef struct _OGMDvdSubpStream OGMDvdSubpStream;
+

OGMDvdSubpStream

+
typedef struct _OGMDvdSubpStream OGMDvdSubpStream;

An opaque structure representing a DVD subtitle stream

+
+
+

OGMDvdReader

+
typedef struct _OGMDvdReader OGMDvdReader;
+

+An opaque structure to read the content of a DVD

+

+ +

+
+
+
+

OGMDvdParser

+
typedef struct _OGMDvdParser OGMDvdParser;
+

+An opaque structure to parse the content of a DVD

+

+ +

+
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ref.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ref.html --- ogmrip-0.11.1/docs/reference/ogmdvd/html/ogmdvd-ref.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/ogmdvd-ref.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,35 +1,58 @@ - -Part I. Types and functions - + +Part I. Types and functions + - + - - + + - +

-Part I. Types and functions

+Part I. Types and functions

This section describes the public structures and enumerated types used throughout the documentation as well as some functions to convert those enumerated types into human readable strings.

+
+

Table of Contents

+
+
+Types — Public data structures used throughout OGMDvd +
+
+Enumerations — Public enumerated types used throughout OGMDvd +
+
+Conversion functions — Converts enumerated types into human readable strings +
+
+Reader — Reads the content of a DVD +
+
+Parser — Parses the content of a DVD +
+
+ +
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/html/style.css /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/html/style.css --- ogmrip-0.11.1/docs/reference/ogmdvd/html/style.css 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/html/style.css 2008-09-28 19:28:17.000000000 +0200 @@ -1,16 +1,16 @@ -.synopsis, .classsynopsis +.synopsis, .classsynopsis { background: #eeeeee; border: solid 1px #aaaaaa; padding: 0.5em; } -.programlisting +.programlisting { background: #eeeeff; border: solid 1px #aaaaff; padding: 0.5em; } -.variablelist +.variablelist { padding: 4px; margin-left: 3em; @@ -19,62 +19,93 @@ { vertical-align: top; } + /* this is needed so that the local anchors are displayed below the naviagtion */ -div.refnamediv a[name], div.refsect1 a[name] -{ - position: relative; - top: -4.5em; -} -table.navigation#top -{ - background: #ffeeee; - border: solid 1px #ffaaaa; - margin-top: 0; - margin-bottom: 0; - position: fixed; - top: 0; - left: 0; - height: 2em; - z-index: 1; +@media screen { + sup a.footnote + { + position: relative; + top: 0em ! important; + } + div.refnamediv a[name], div.refsect1 a[name] + { + position: relative; + top: -4.5em; + } + table.navigation#top + { + background: #ffeeee; + border: solid 1px #ffaaaa; + margin-top: 0; + margin-bottom: 0; + position: fixed; + top: 0; + left: 0; + height: 2em; + z-index: 1; + } + .navigation a + { + color: #770000; + } + .navigation a:visited + { + color: #550000; + } + td.shortcuts + { + color: #770000; + font-size: 80%; + } + div.refentry, div.chapter, div.reference, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface + { + position: relative; + top: 3em; + z-index: 0; + } + div.refnamediv + { + margin-top: 2em; + } + body + { + padding-bottom: 20em; + } +} +@media print { + table.navigation { + visibility: collapse; + display: none; + } + div.titlepage table.navigation { + visibility: visible; + display: table; + background: #ffeeee; + border: solid 1px #ffaaaa; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + height: 2em; + } } -.navigation a -{ - color: #770000; -} -.navigation a:visited -{ - color: #550000; -} -.navigation .title + +.navigation .title { font-size: 200%; } -td.shortcuts -{ - color: #770000; - font-size: 80%; -} -div.refentry, div.chapter, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface -{ - position: relative; - top: 3em; - z-index: 0; -} -div.refnamediv -{ - margin-top: 2em; -} -div.gallery-float + +div.gallery-float { float: left; padding: 10px; } -div.gallery-float img +div.gallery-float img { border-style: none; } -div.gallery-spacer +div.gallery-spacer { clear: both; } @@ -110,3 +141,20 @@ { background-color: #eeeeee; } + +hr +{ + color: #777777; + background: #777777; + border: 0; + height: 1px; + clear: both; +} + +.footer +{ + padding-top: 3.5em; + color: #777777; + text-align: center; + font-size: 80%; +} diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/Makefile.in /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/Makefile.in --- ogmrip-0.11.1/docs/reference/ogmdvd/Makefile.in 2007-10-21 21:05:55.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/Makefile.in 2008-09-21 14:16:34.000000000 +0200 @@ -45,8 +45,7 @@ $(top_srcdir)/gtk-doc.make subdir = docs/reference/ogmdvd ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -80,6 +79,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ DVDREAD_LIBS = @DVDREAD_LIBS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -93,7 +93,6 @@ ENCHANT_LIBS = @ENCHANT_LIBS@ EXEEXT = @EXEEXT@ F77 = @F77@ -FAAC_PROG = @FAAC_PROG@ FFLAGS = @FFLAGS@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ @@ -104,8 +103,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GOCR_PROG = @GOCR_PROG@ GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ GUI_CFLAGS = @GUI_CFLAGS@ @@ -114,24 +113,38 @@ HAL_LIBS = @HAL_LIBS@ HAVE_AAC_SUPPORT_FALSE = @HAVE_AAC_SUPPORT_FALSE@ HAVE_AAC_SUPPORT_TRUE = @HAVE_AAC_SUPPORT_TRUE@ -HAVE_DTS_SUPPORT_FALSE = @HAVE_DTS_SUPPORT_FALSE@ -HAVE_DTS_SUPPORT_TRUE = @HAVE_DTS_SUPPORT_TRUE@ HAVE_ENCHANT_SUPPORT_FALSE = @HAVE_ENCHANT_SUPPORT_FALSE@ HAVE_ENCHANT_SUPPORT_TRUE = @HAVE_ENCHANT_SUPPORT_TRUE@ HAVE_GTK_SUPPORT_FALSE = @HAVE_GTK_SUPPORT_FALSE@ HAVE_GTK_SUPPORT_TRUE = @HAVE_GTK_SUPPORT_TRUE@ +HAVE_LAVC_SUPPORT_FALSE = @HAVE_LAVC_SUPPORT_FALSE@ +HAVE_LAVC_SUPPORT_TRUE = @HAVE_LAVC_SUPPORT_TRUE@ HAVE_LAVF_SUPPORT_FALSE = @HAVE_LAVF_SUPPORT_FALSE@ HAVE_LAVF_SUPPORT_TRUE = @HAVE_LAVF_SUPPORT_TRUE@ HAVE_MKV_SUPPORT_FALSE = @HAVE_MKV_SUPPORT_FALSE@ HAVE_MKV_SUPPORT_TRUE = @HAVE_MKV_SUPPORT_TRUE@ +HAVE_MP3_SUPPORT_FALSE = @HAVE_MP3_SUPPORT_FALSE@ +HAVE_MP3_SUPPORT_TRUE = @HAVE_MP3_SUPPORT_TRUE@ +HAVE_MP4_SUPPORT_FALSE = @HAVE_MP4_SUPPORT_FALSE@ +HAVE_MP4_SUPPORT_TRUE = @HAVE_MP4_SUPPORT_TRUE@ +HAVE_OGM_SUPPORT_FALSE = @HAVE_OGM_SUPPORT_FALSE@ +HAVE_OGM_SUPPORT_TRUE = @HAVE_OGM_SUPPORT_TRUE@ +HAVE_PNG_SUPPORT_FALSE = @HAVE_PNG_SUPPORT_FALSE@ +HAVE_PNG_SUPPORT_TRUE = @HAVE_PNG_SUPPORT_TRUE@ HAVE_SRT_SUPPORT_FALSE = @HAVE_SRT_SUPPORT_FALSE@ HAVE_SRT_SUPPORT_TRUE = @HAVE_SRT_SUPPORT_TRUE@ HAVE_THEORA_SUPPORT_FALSE = @HAVE_THEORA_SUPPORT_FALSE@ HAVE_THEORA_SUPPORT_TRUE = @HAVE_THEORA_SUPPORT_TRUE@ +HAVE_TIFF_SUPPORT_FALSE = @HAVE_TIFF_SUPPORT_FALSE@ +HAVE_TIFF_SUPPORT_TRUE = @HAVE_TIFF_SUPPORT_TRUE@ +HAVE_VORBIS_SUPPORT_FALSE = @HAVE_VORBIS_SUPPORT_FALSE@ +HAVE_VORBIS_SUPPORT_TRUE = @HAVE_VORBIS_SUPPORT_TRUE@ HAVE_X264_SUPPORT_FALSE = @HAVE_X264_SUPPORT_FALSE@ HAVE_X264_SUPPORT_TRUE = @HAVE_X264_SUPPORT_TRUE@ HAVE_XSLTPROC_PROG_FALSE = @HAVE_XSLTPROC_PROG_FALSE@ HAVE_XSLTPROC_PROG_TRUE = @HAVE_XSLTPROC_PROG_TRUE@ +HAVE_XVID_SUPPORT_FALSE = @HAVE_XVID_SUPPORT_FALSE@ +HAVE_XVID_SUPPORT_TRUE = @HAVE_XVID_SUPPORT_TRUE@ HTML_DIR = @HTML_DIR@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -143,14 +156,12 @@ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_ICONV = @INTLTOOL_ICONV@ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -162,16 +173,19 @@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -LAME_PROG = @LAME_PROG@ LDFLAGS = @LDFLAGS@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ +LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBTIFF_LIBS = @LIBTIFF_LIBS@ LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -180,21 +194,15 @@ MAKEINFO = @MAKEINFO@ MENCODER_PROG = @MENCODER_PROG@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MKVMERGE_PROG = @MKVMERGE_PROG@ -MPLAYER_MAJOR_VERSION = @MPLAYER_MAJOR_VERSION@ -MPLAYER_MINOR_VERSION = @MPLAYER_MINOR_VERSION@ -MPLAYER_PRE_VERSION = @MPLAYER_PRE_VERSION@ MPLAYER_PROG = @MPLAYER_PROG@ -MPLAYER_RC_VERSION = @MPLAYER_RC_VERSION@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ -OCRAD_PROG = @OCRAD_PROG@ -OGGENC_PROG = @OGGENC_PROG@ OGMDVD_GTK_LT_VERSION = @OGMDVD_GTK_LT_VERSION@ OGMDVD_LT_VERSION = @OGMDVD_LT_VERSION@ OGMJOB_LT_VERSION = @OGMJOB_LT_VERSION@ -OGMMERGE_PROG = @OGMMERGE_PROG@ OGMRIP_CFLAGS = @OGMRIP_CFLAGS@ OGMRIP_GTK_LT_VERSION = @OGMRIP_GTK_LT_VERSION@ OGMRIP_LIBS = @OGMRIP_LIBS@ @@ -203,7 +211,6 @@ OGMRIP_MICRO_VERSION = @OGMRIP_MICRO_VERSION@ OGMRIP_MINOR_VERSION = @OGMRIP_MINOR_VERSION@ OGMRIP_VERSION = @OGMRIP_VERSION@ -OGMSPLIT_PROG = @OGMSPLIT_PROG@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -282,10 +289,10 @@ HFILE_GLOB = $(top_srcdir)/libogmdvd/*.h CFILE_GLOB = $(top_srcdir)/libogmdvd/*.c IGNORE_HFILES = ogmdvd-priv.h ogmdvd.h -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) # We set GPATH here; this gives us semantics for GNU make # which are more like other make's VPATH, when it comes to @@ -311,7 +318,12 @@ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals -CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS) +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) all: all-am .SUFFIXES: @@ -427,7 +439,8 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic distclean-libtool \ + distclean-local dvi: dvi-am @@ -470,9 +483,9 @@ .PHONY: all all-am all-local check check-am clean clean-generic \ clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-local install-exec \ + distclean-generic distclean-libtool distclean-local distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic \ @@ -517,6 +530,9 @@ tmpl.stamp: tmpl-build.stamp @true +tmpl/*.sgml: + @true + #### xml #### sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) @@ -534,11 +550,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Building HTML' @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html + rm -rf $(srcdir)/html mkdir $(srcdir)/html cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' + @echo 'gtk-doc: Fixing cross-references' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp @@ -548,11 +564,16 @@ rm -f *~ *.bak rm -rf .libs +distclean-local: + cd $(srcdir) && \ + rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + cd $(srcdir) && rm -rf xml html install-data-local: - installfiles=`echo $(srcdir)/html/*`; \ + -installfiles=`echo $(srcdir)/html/*`; \ if test "$$installfiles" = '$(srcdir)/html/*'; \ then echo '-- Nothing to install' ; \ else \ @@ -563,6 +584,8 @@ done; \ echo '-- Installing $(srcdir)/html/index.sgml' ; \ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + which gtkdoc-rebase >/dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ fi uninstall-local: @@ -583,9 +606,10 @@ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/xml/*.xml $(distdir)/xml cp $(srcdir)/html/* $(distdir)/html - if test -f $(srcdir)/$(DOC_MODULE).types; then \ - cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \ - fi + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/ogmdvd-sections.txt /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/ogmdvd-sections.txt --- ogmrip-0.11.1/docs/reference/ogmdvd/ogmdvd-sections.txt 2007-10-07 21:03:53.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/ogmdvd-sections.txt 2008-09-28 19:28:17.000000000 +0200 @@ -31,6 +31,8 @@ OGMDvdStream OGMDvdAudioStream OGMDvdSubpStream +OGMDvdReader +OGMDvdParser
@@ -38,6 +40,7 @@ ogmdvd_stream_ref ogmdvd_stream_unref ogmdvd_stream_get_title +ogmdvd_stream_get_id ogmdvd_stream_get_nr
@@ -48,12 +51,14 @@ ogmdvd_audio_stream_get_language ogmdvd_audio_stream_get_quantization ogmdvd_audio_stream_get_content +ogmdvd_audio_stream_get_bitrate
ogmdvd-title ogmdvd_title_ref ogmdvd_title_unref +ogmdvd_title_analyze ogmdvd_title_get_disc ogmdvd_title_get_vts_size ogmdvd_title_get_nr @@ -69,8 +74,10 @@ ogmdvd_title_get_n_chapters ogmdvd_title_get_n_audio_streams ogmdvd_title_get_nth_audio_stream +ogmdvd_title_get_audio_streams ogmdvd_title_get_n_subp_streams ogmdvd_title_get_nth_subp_stream +ogmdvd_title_get_subp_streams ogmdvd_title_get_aspect_ratio
@@ -81,10 +88,12 @@ ogmdvd_disc_ref ogmdvd_disc_unref ogmdvd_disc_get_label +ogmdvd_disc_get_id ogmdvd_disc_get_device ogmdvd_disc_get_vmg_size ogmdvd_disc_get_n_titles ogmdvd_disc_get_nth_title +ogmdvd_disc_get_titles
@@ -93,3 +102,24 @@ ogmdvd_subp_stream_get_content
+
+ogmdvd-reader +ogmdvd_reader_new +ogmdvd_reader_new_by_cells +ogmdvd_reader_ref +ogmdvd_reader_unref +ogmdvd_reader_get_block +
+ +
+ogmdvd-parser +OGMDvdParserStatus +ogmdvd_parser_new +ogmdvd_parser_ref +ogmdvd_parser_unref +ogmdvd_parser_analyze +ogmdvd_parser_get_max_frames +ogmdvd_parser_set_max_frames +ogmdvd_parser_get_audio_bitrate +
+ diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/ogmdvd.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/ogmdvd.xml --- ogmrip-0.11.1/docs/reference/ogmdvd/ogmdvd.xml 2007-10-07 21:03:53.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/ogmdvd.xml 2008-06-09 21:01:02.000000000 +0200 @@ -18,6 +18,8 @@ + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-audio.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-audio.sgml --- ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-audio.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-audio.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -62,3 +62,12 @@ @Returns: + + + + + +@audio: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-disc.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-disc.sgml --- ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-disc.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-disc.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -66,6 +66,15 @@ @Returns: + + + + + +@disc: +@Returns: + + @@ -103,3 +112,12 @@ @Returns: + + + + + +@disc: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-parser.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-parser.sgml --- ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-parser.sgml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-parser.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,91 @@ + +ogmdvd-parser + + + + + + + + + + + + + + + + + + + + + + +@OGMDVD_PARSER_STATUS_NONE: +@OGMDVD_PARSER_STATUS_BITRATES: +@OGMDVD_PARSER_STATUS_MAX_FRAMES: + + + + + + +@title: +@Returns: + + + + + + + +@parser: + + + + + + + +@parser: + + + + + + + +@parser: +@buffer: +@Returns: + + + + + + + +@parser: +@Returns: + + + + + + + +@parser: +@max_frames: + + + + + + + +@parser: +@nr: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-reader.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-reader.sgml --- ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-reader.sgml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-reader.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,70 @@ + +ogmdvd-reader + + + + + + + + + + + + + + + + + + + + + + +@title: +@start_chap: +@end_chap: +@angle: +@Returns: + + + + + + + +@title: +@start_cell: +@end_cell: +@angle: +@Returns: + + + + + + + +@reader: + + + + + + + +@reader: + + + + + + + +@reader: +@len: +@buffer: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-stream.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-stream.sgml --- ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-stream.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-stream.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -42,6 +42,15 @@ @Returns: + + + + + +@stream: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-title.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-title.sgml --- ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-title.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-title.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -33,6 +33,15 @@ @title: + + + + + +@title: +@Returns: + + @@ -175,6 +184,15 @@ @Returns: + + + + + +@title: +@Returns: + + @@ -194,6 +212,15 @@ @Returns: + + + + + +@title: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-types.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-types.sgml --- ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-types.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-types.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -47,3 +47,15 @@ + + + + + + + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-unused.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-unused.sgml --- ogmrip-0.11.1/docs/reference/ogmdvd/tmpl/ogmdvd-unused.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/tmpl/ogmdvd-unused.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -5,3 +5,11 @@ @OGMDVD_ERROR_UNKNOWN: + + + + + +@parser: +@Returns: + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-audio.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-audio.xml --- ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-audio.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-audio.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMDvdAudio +OGMDvdAudio 3 OGMDVD Library @@ -15,20 +15,20 @@ - + Synopsis #include <ogmdvd-audio.h> - gint ogmdvd_audio_stream_get_format (OGMDvdAudioStream *audio); gint ogmdvd_audio_stream_get_channels (OGMDvdAudioStream *audio); gint ogmdvd_audio_stream_get_language (OGMDvdAudioStream *audio); gint ogmdvd_audio_stream_get_quantization (OGMDvdAudioStream *audio); gint ogmdvd_audio_stream_get_content (OGMDvdAudioStream *audio); +gint ogmdvd_audio_stream_get_bitrate (OGMDvdAudioStream *audio); @@ -40,7 +40,7 @@ - + Description @@ -49,11 +49,11 @@ - + Details - -<anchor id="ogmdvd-audio-stream-get-format" role="function"/>ogmdvd_audio_stream_get_format () -ogmdvd_audio_stream_get_formatgint ogmdvd_audio_stream_get_format (OGMDvdAudioStream *audio); + +ogmdvd_audio_stream_get_format () +ogmdvd_audio_stream_get_formatgint ogmdvd_audio_stream_get_format (OGMDvdAudioStream *audio); Returns the format of the audio stream. @@ -65,9 +65,9 @@ Returns : OGMDvdAudioFormat, or -1 - -<anchor id="ogmdvd-audio-stream-get-channels" role="function"/>ogmdvd_audio_stream_get_channels () -ogmdvd_audio_stream_get_channelsgint ogmdvd_audio_stream_get_channels (OGMDvdAudioStream *audio); + +ogmdvd_audio_stream_get_channels () +ogmdvd_audio_stream_get_channelsgint ogmdvd_audio_stream_get_channels (OGMDvdAudioStream *audio); Returns the number of channels of the audio stream. @@ -79,9 +79,9 @@ Returns : OGMDvdAudioChannels, or -1 - -<anchor id="ogmdvd-audio-stream-get-language" role="function"/>ogmdvd_audio_stream_get_language () -ogmdvd_audio_stream_get_languagegint ogmdvd_audio_stream_get_language (OGMDvdAudioStream *audio); + +ogmdvd_audio_stream_get_language () +ogmdvd_audio_stream_get_languagegint ogmdvd_audio_stream_get_language (OGMDvdAudioStream *audio); Returns the language of the audio stream. @@ -93,9 +93,9 @@ Returns : the language code, or -1 - -<anchor id="ogmdvd-audio-stream-get-quantization" role="function"/>ogmdvd_audio_stream_get_quantization () -ogmdvd_audio_stream_get_quantizationgint ogmdvd_audio_stream_get_quantization + +ogmdvd_audio_stream_get_quantization () +ogmdvd_audio_stream_get_quantizationgint ogmdvd_audio_stream_get_quantization (OGMDvdAudioStream *audio); Returns the quantization of the audio stream. @@ -108,9 +108,9 @@ Returns : OGMDvdAudioQuantization, or -1 - -<anchor id="ogmdvd-audio-stream-get-content" role="function"/>ogmdvd_audio_stream_get_content () -ogmdvd_audio_stream_get_contentgint ogmdvd_audio_stream_get_content (OGMDvdAudioStream *audio); + +ogmdvd_audio_stream_get_content () +ogmdvd_audio_stream_get_contentgint ogmdvd_audio_stream_get_content (OGMDvdAudioStream *audio); Returns the content of the audio stream. @@ -122,6 +122,20 @@ Returns : OGMDvdAudioContent, or -1 + +ogmdvd_audio_stream_get_bitrate () +ogmdvd_audio_stream_get_bitrategint ogmdvd_audio_stream_get_bitrate (OGMDvdAudioStream *audio); + +Returns the bitrate of the audio stream in bps. + + + +audio : + An OGMDvdAudioStream + +Returns : the bitrate, or -1 + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-disc.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-disc.xml --- ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-disc.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-disc.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMDvdDisc +OGMDvdDisc 3 OGMDVD Library @@ -15,25 +15,26 @@ - + Synopsis #include <ogmdvd-disc.h> - enum OGMDvdDiscError; OGMDvdDisc* ogmdvd_disc_open (const gchar *device, GError **error); void ogmdvd_disc_ref (OGMDvdDisc *disc); void ogmdvd_disc_unref (OGMDvdDisc *disc); gchar* ogmdvd_disc_get_label (OGMDvdDisc *disc); +gchar* ogmdvd_disc_get_id (OGMDvdDisc *disc); gchar* ogmdvd_disc_get_device (OGMDvdDisc *disc); gint64 ogmdvd_disc_get_vmg_size (OGMDvdDisc *disc); gint ogmdvd_disc_get_n_titles (OGMDvdDisc *disc); OGMDvdTitle* ogmdvd_disc_get_nth_title (OGMDvdDisc *disc, guint nr); +GList* ogmdvd_disc_get_titles (OGMDvdDisc *disc); @@ -45,7 +46,7 @@ - + Description @@ -54,11 +55,11 @@ - + Details - -<anchor id="OGMDvdDiscError" role="enum"/>enum OGMDvdDiscError -OGMDvdDiscErrortypedef enum + +enum OGMDvdDiscError +OGMDvdDiscErrortypedef enum { OGMDVD_DISC_ERROR_EXIST, /* No such file or directory */ OGMDVD_DISC_ERROR_PERM, /* Permission denied to access device */ @@ -75,50 +76,50 @@ - -OGMDVD_DISC_ERROR_EXIST + +OGMDVD_DISC_ERROR_EXIST No such file or directory - -OGMDVD_DISC_ERROR_PERM + +OGMDVD_DISC_ERROR_PERM Permission denied to access device - -OGMDVD_DISC_ERROR_TRAY + +OGMDVD_DISC_ERROR_TRAY Tray seems to be opened - -OGMDVD_DISC_ERROR_DEV + +OGMDVD_DISC_ERROR_DEV Device does not contain a valid DVD video - -OGMDVD_DISC_ERROR_PATH + +OGMDVD_DISC_ERROR_PATH Path does not contain a valid DVD structure - -OGMDVD_DISC_ERROR_ACCESS + +OGMDVD_DISC_ERROR_ACCESS No such directory, block device or iso file - -OGMDVD_DISC_ERROR_VMG + +OGMDVD_DISC_ERROR_VMG Cannot open video manager - -OGMDVD_DISC_ERROR_UNKNOWN + +OGMDVD_DISC_ERROR_UNKNOWN Unknown error - -<anchor id="ogmdvd-disc-open" role="function"/>ogmdvd_disc_open () -ogmdvd_disc_openOGMDvdDisc* ogmdvd_disc_open (const gchar *device, + +ogmdvd_disc_open () +ogmdvd_disc_openOGMDvdDisc* ogmdvd_disc_open (const gchar *device, GError **error); Creates a new OGMDvdDisc given a DVD device. @@ -134,9 +135,9 @@ Returns : The new OGMDvdDisc, or NULL - -<anchor id="ogmdvd-disc-ref" role="function"/>ogmdvd_disc_ref () -ogmdvd_disc_refvoid ogmdvd_disc_ref (OGMDvdDisc *disc); + +ogmdvd_disc_ref () +ogmdvd_disc_refvoid ogmdvd_disc_ref (OGMDvdDisc *disc); Increments the reference count of an OGMDvdDisc. @@ -146,9 +147,9 @@ An OGMDvdDisc - -<anchor id="ogmdvd-disc-unref" role="function"/>ogmdvd_disc_unref () -ogmdvd_disc_unrefvoid ogmdvd_disc_unref (OGMDvdDisc *disc); + +ogmdvd_disc_unref () +ogmdvd_disc_unrefvoid ogmdvd_disc_unref (OGMDvdDisc *disc); Decrements the reference count of an OGMDvdDisc. @@ -158,9 +159,9 @@ An OGMDvdDisc - -<anchor id="ogmdvd-disc-get-label" role="function"/>ogmdvd_disc_get_label () -ogmdvd_disc_get_labelgchar* ogmdvd_disc_get_label (OGMDvdDisc *disc); + +ogmdvd_disc_get_label () +ogmdvd_disc_get_labelgchar* ogmdvd_disc_get_label (OGMDvdDisc *disc); Returns the label of the DVD. @@ -172,9 +173,23 @@ Returns : The label of the DVD, or NULL - -<anchor id="ogmdvd-disc-get-device" role="function"/>ogmdvd_disc_get_device () -ogmdvd_disc_get_devicegchar* ogmdvd_disc_get_device (OGMDvdDisc *disc); + +ogmdvd_disc_get_id () +ogmdvd_disc_get_idgchar* ogmdvd_disc_get_id (OGMDvdDisc *disc); + +Returns a unique 128 bit disc identifier. + + + +disc : + An OGMDvdDisc + +Returns : The identifier, or NULL + + + +ogmdvd_disc_get_device () +ogmdvd_disc_get_devicegchar* ogmdvd_disc_get_device (OGMDvdDisc *disc); Returns the DVD device. @@ -186,9 +201,9 @@ Returns : The device of the DVD. - -<anchor id="ogmdvd-disc-get-vmg-size" role="function"/>ogmdvd_disc_get_vmg_size () -ogmdvd_disc_get_vmg_sizegint64 ogmdvd_disc_get_vmg_size (OGMDvdDisc *disc); + +ogmdvd_disc_get_vmg_size () +ogmdvd_disc_get_vmg_sizegint64 ogmdvd_disc_get_vmg_size (OGMDvdDisc *disc); Returns the size of the video manager in bytes. @@ -200,9 +215,9 @@ Returns : The size in bytes, or -1 - -<anchor id="ogmdvd-disc-get-n-titles" role="function"/>ogmdvd_disc_get_n_titles () -ogmdvd_disc_get_n_titlesgint ogmdvd_disc_get_n_titles (OGMDvdDisc *disc); + +ogmdvd_disc_get_n_titles () +ogmdvd_disc_get_n_titlesgint ogmdvd_disc_get_n_titles (OGMDvdDisc *disc); Returns the number of video titles of this DVD. @@ -214,9 +229,9 @@ Returns : The number of video titles, or -1 - -<anchor id="ogmdvd-disc-get-nth-title" role="function"/>ogmdvd_disc_get_nth_title () -ogmdvd_disc_get_nth_titleOGMDvdTitle* ogmdvd_disc_get_nth_title (OGMDvdDisc *disc, + +ogmdvd_disc_get_nth_title () +ogmdvd_disc_get_nth_titleOGMDvdTitle* ogmdvd_disc_get_nth_title (OGMDvdDisc *disc, guint nr); Returns the video title at position nr. The first nr is 0. @@ -232,6 +247,20 @@ Returns : The OGMDvdTitle, or NULL + +ogmdvd_disc_get_titles () +ogmdvd_disc_get_titlesGList* ogmdvd_disc_get_titles (OGMDvdDisc *disc); + +Returns a list of all the titles of disc. + + + +disc : + An OGMDvdDisc + +Returns : A GList, or NULL + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-enums.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-enums.xml --- ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-enums.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-enums.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -Enumerations +Enumerations 3 OGMDVD Library @@ -15,14 +15,13 @@ - + Synopsis #include <ogmdvd-enums.h> - enum OGMDvdVideoFormat; enum OGMDvdDisplayAspect; enum OGMDvdDisplayFormat; @@ -42,7 +41,7 @@ - + Description @@ -51,11 +50,11 @@ - + Details - -<anchor id="OGMDvdVideoFormat" role="enum"/>enum OGMDvdVideoFormat -OGMDvdVideoFormattypedef enum + +enum OGMDvdVideoFormat +OGMDvdVideoFormattypedef enum { OGMDVD_VIDEO_FORMAT_NTSC = 0, OGMDVD_VIDEO_FORMAT_PAL = 1 @@ -66,20 +65,20 @@ - -OGMDVD_VIDEO_FORMAT_NTSC + +OGMDVD_VIDEO_FORMAT_NTSC The title is NTSC - -OGMDVD_VIDEO_FORMAT_PAL + +OGMDVD_VIDEO_FORMAT_PAL The title is PAL - -<anchor id="OGMDvdDisplayAspect" role="enum"/>enum OGMDvdDisplayAspect -OGMDvdDisplayAspecttypedef enum + +enum OGMDvdDisplayAspect +OGMDvdDisplayAspecttypedef enum { OGMDVD_DISPLAY_ASPECT_4_3 = 0, OGMDVD_DISPLAY_ASPECT_16_9 = 1 @@ -90,20 +89,20 @@ - -OGMDVD_DISPLAY_ASPECT_4_3 + +OGMDVD_DISPLAY_ASPECT_4_3 The title is 4/3 - -OGMDVD_DISPLAY_ASPECT_16_9 + +OGMDVD_DISPLAY_ASPECT_16_9 The title is 16/9 - -<anchor id="OGMDvdDisplayFormat" role="enum"/>enum OGMDvdDisplayFormat -OGMDvdDisplayFormattypedef enum + +enum OGMDvdDisplayFormat +OGMDvdDisplayFormattypedef enum { OGMDVD_DISPLAY_FORMAT_PS_LETTER = 0, OGMDVD_DISPLAY_FORMAT_PAN_SCAN = 1, @@ -115,25 +114,25 @@ - -OGMDVD_DISPLAY_FORMAT_PS_LETTER + +OGMDVD_DISPLAY_FORMAT_PS_LETTER The title is pan & scan letter - -OGMDVD_DISPLAY_FORMAT_PAN_SCAN + +OGMDVD_DISPLAY_FORMAT_PAN_SCAN The title is is pan & scan - -OGMDVD_DISPLAY_FORMAT_LETTERBOX + +OGMDVD_DISPLAY_FORMAT_LETTERBOX The title is letterbox - -<anchor id="OGMDvdAudioFormat" role="enum"/>enum OGMDvdAudioFormat -OGMDvdAudioFormattypedef enum + +enum OGMDvdAudioFormat +OGMDvdAudioFormattypedef enum { OGMDVD_AUDIO_FORMAT_AC3 = 0, OGMDVD_AUDIO_FORMAT_MPEG1 = 2, @@ -148,40 +147,40 @@ - -OGMDVD_AUDIO_FORMAT_AC3 + +OGMDVD_AUDIO_FORMAT_AC3 The stream is in AC3 - -OGMDVD_AUDIO_FORMAT_MPEG1 + +OGMDVD_AUDIO_FORMAT_MPEG1 The stream is in Mpeg-1 - -OGMDVD_AUDIO_FORMAT_MPEG2EXT + +OGMDVD_AUDIO_FORMAT_MPEG2EXT The stream is in Mpeg-2 extended - -OGMDVD_AUDIO_FORMAT_LPCM + +OGMDVD_AUDIO_FORMAT_LPCM The stream is in LPCM - -OGMDVD_AUDIO_FORMAT_SDDS + +OGMDVD_AUDIO_FORMAT_SDDS The stream is in SDDS - -OGMDVD_AUDIO_FORMAT_DTS + +OGMDVD_AUDIO_FORMAT_DTS The stream is in DTS - -<anchor id="OGMDvdAudioChannels" role="enum"/>enum OGMDvdAudioChannels -OGMDvdAudioChannelstypedef enum + +enum OGMDvdAudioChannels +OGMDvdAudioChannelstypedef enum { OGMDVD_AUDIO_CHANNELS_MONO = 0, OGMDVD_AUDIO_CHANNELS_STEREO = 1, @@ -194,30 +193,30 @@ - -OGMDVD_AUDIO_CHANNELS_MONO - The stream is in mono + +OGMDVD_AUDIO_CHANNELS_MONO + The stream is mono - -OGMDVD_AUDIO_CHANNELS_STEREO - The stream is in stereo + +OGMDVD_AUDIO_CHANNELS_STEREO + The stream is stereo - -OGMDVD_AUDIO_CHANNELS_SURROUND - The stream is in surround + +OGMDVD_AUDIO_CHANNELS_SURROUND + The stream is surround - -OGMDVD_AUDIO_CHANNELS_5_1 - The stream is in 5.1 + +OGMDVD_AUDIO_CHANNELS_5_1 + The stream is 5.1 - -<anchor id="OGMDvdAudioQuantization" role="enum"/>enum OGMDvdAudioQuantization -OGMDvdAudioQuantizationtypedef enum + +enum OGMDvdAudioQuantization +OGMDvdAudioQuantizationtypedef enum { OGMDVD_AUDIO_QUANTIZATION_16 = 0, OGMDVD_AUDIO_QUANTIZATION_20 = 1, @@ -230,30 +229,30 @@ - -OGMDVD_AUDIO_QUANTIZATION_16 + +OGMDVD_AUDIO_QUANTIZATION_16 The stream is quantized in 16 bits - -OGMDVD_AUDIO_QUANTIZATION_20 + +OGMDVD_AUDIO_QUANTIZATION_20 The stream is quantized in 20 bits - -OGMDVD_AUDIO_QUANTIZATION_24 + +OGMDVD_AUDIO_QUANTIZATION_24 The stream is quantized in 24 bits - -OGMDVD_AUDIO_QUANTIZATION_DRC + +OGMDVD_AUDIO_QUANTIZATION_DRC The stream is quantized in DRC - -<anchor id="OGMDvdAudioContent" role="enum"/>enum OGMDvdAudioContent -OGMDvdAudioContenttypedef enum + +enum OGMDvdAudioContent +OGMDvdAudioContenttypedef enum { OGMDVD_AUDIO_CONTENT_UNDEFINED = 0, OGMDVD_AUDIO_CONTENT_NORMAL = 1, @@ -267,35 +266,35 @@ - -OGMDVD_AUDIO_CONTENT_UNDEFINED + +OGMDVD_AUDIO_CONTENT_UNDEFINED The stream has undefined content - -OGMDVD_AUDIO_CONTENT_NORMAL + +OGMDVD_AUDIO_CONTENT_NORMAL The stream has normal content - -OGMDVD_AUDIO_CONTENT_IMPAIRED + +OGMDVD_AUDIO_CONTENT_IMPAIRED The stream has content for impaired audience - -OGMDVD_AUDIO_CONTENT_COMMENTS1 + +OGMDVD_AUDIO_CONTENT_COMMENTS1 The stream is a commentary - -OGMDVD_AUDIO_CONTENT_COMMENTS2 + +OGMDVD_AUDIO_CONTENT_COMMENTS2 The stream is a commentary - -<anchor id="OGMDvdSubpContent" role="enum"/>enum OGMDvdSubpContent -OGMDvdSubpContenttypedef enum + +enum OGMDvdSubpContent +OGMDvdSubpContenttypedef enum { OGMDVD_SUBP_CONTENT_UNDEFINED, OGMDVD_SUBP_CONTENT_NORMAL, @@ -320,83 +319,83 @@ - -OGMDVD_SUBP_CONTENT_UNDEFINED + +OGMDVD_SUBP_CONTENT_UNDEFINED The stream has undefined content - -OGMDVD_SUBP_CONTENT_NORMAL + +OGMDVD_SUBP_CONTENT_NORMAL The stream has normal content - -OGMDVD_SUBP_CONTENT_LARGE + +OGMDVD_SUBP_CONTENT_LARGE The stream has large content - -OGMDVD_SUBP_CONTENT_CHILDREN + +OGMDVD_SUBP_CONTENT_CHILDREN The stream has content for children - -OGMDVD_SUBP_CONTENT_RESERVED1 + +OGMDVD_SUBP_CONTENT_RESERVED1 Reserved - -OGMDVD_SUBP_CONTENT_NORMAL_CC + +OGMDVD_SUBP_CONTENT_NORMAL_CC The stream has normal closed caption content - -OGMDVD_SUBP_CONTENT_LARGE_CC + +OGMDVD_SUBP_CONTENT_LARGE_CC The stream has large closed caption content - -OGMDVD_SUBP_CONTENT_CHILDREN_CC + +OGMDVD_SUBP_CONTENT_CHILDREN_CC The stream has closed caption content for children - -OGMDVD_SUBP_CONTENT_RESERVED2 + +OGMDVD_SUBP_CONTENT_RESERVED2 Reserved - -OGMDVD_SUBP_CONTENT_FORCED + +OGMDVD_SUBP_CONTENT_FORCED The stream has forced content - -OGMDVD_SUBP_CONTENT_RESERVED3 + +OGMDVD_SUBP_CONTENT_RESERVED3 Reserved - -OGMDVD_SUBP_CONTENT_RESERVED4 + +OGMDVD_SUBP_CONTENT_RESERVED4 Reserved - -OGMDVD_SUBP_CONTENT_RESERVED5 + +OGMDVD_SUBP_CONTENT_RESERVED5 Reserved - -OGMDVD_SUBP_CONTENT_DIRECTOR + +OGMDVD_SUBP_CONTENT_DIRECTOR The stream has director commentary content - -OGMDVD_SUBP_CONTENT_LARGE_DIRECTOR + +OGMDVD_SUBP_CONTENT_LARGE_DIRECTOR The stream has large director commentary content - -OGMDVD_SUBP_CONTENT_CHILDREN_DIRECTOR + +OGMDVD_SUBP_CONTENT_CHILDREN_DIRECTOR The stream has director commentary content for children diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-labels.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-labels.xml --- ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-labels.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-labels.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -Conversion functions +Conversion functions 3 OGMDVD Library @@ -15,14 +15,13 @@ - + Synopsis #include <ogmdvd-labels.h> - const gchar* ogmdvd_get_video_format_label (gint format); const gchar* ogmdvd_get_display_aspect_label (gint aspect); const gchar* ogmdvd_get_audio_format_label (gint format); @@ -44,7 +43,7 @@ - + Description @@ -53,11 +52,11 @@ - + Details - -<anchor id="ogmdvd-get-video-format-label" role="function"/>ogmdvd_get_video_format_label () -ogmdvd_get_video_format_labelconst gchar* ogmdvd_get_video_format_label (gint format); + +ogmdvd_get_video_format_label () +ogmdvd_get_video_format_labelconst gchar* ogmdvd_get_video_format_label (gint format); Returns a human readable video format. @@ -69,9 +68,9 @@ Returns : A constant string, or NULL - -<anchor id="ogmdvd-get-display-aspect-label" role="function"/>ogmdvd_get_display_aspect_label () -ogmdvd_get_display_aspect_labelconst gchar* ogmdvd_get_display_aspect_label (gint aspect); + +ogmdvd_get_display_aspect_label () +ogmdvd_get_display_aspect_labelconst gchar* ogmdvd_get_display_aspect_label (gint aspect); Returns a human readable display aspect. @@ -83,9 +82,9 @@ Returns : A constant string, or NULL - -<anchor id="ogmdvd-get-audio-format-label" role="function"/>ogmdvd_get_audio_format_label () -ogmdvd_get_audio_format_labelconst gchar* ogmdvd_get_audio_format_label (gint format); + +ogmdvd_get_audio_format_label () +ogmdvd_get_audio_format_labelconst gchar* ogmdvd_get_audio_format_label (gint format); Returns a human readable audio format. @@ -97,9 +96,9 @@ Returns : A constant string, or NULL - -<anchor id="ogmdvd-get-audio-channels-label" role="function"/>ogmdvd_get_audio_channels_label () -ogmdvd_get_audio_channels_labelconst gchar* ogmdvd_get_audio_channels_label (gint channels); + +ogmdvd_get_audio_channels_label () +ogmdvd_get_audio_channels_labelconst gchar* ogmdvd_get_audio_channels_label (gint channels); Returns a human readable number of channels. @@ -111,9 +110,9 @@ Returns : A constant string, or NULL - -<anchor id="ogmdvd-get-audio-quantization-label" role="function"/>ogmdvd_get_audio_quantization_label () -ogmdvd_get_audio_quantization_labelconst gchar* ogmdvd_get_audio_quantization_label (gint quantization); + +ogmdvd_get_audio_quantization_label () +ogmdvd_get_audio_quantization_labelconst gchar* ogmdvd_get_audio_quantization_label (gint quantization); Returns a human readable quantization. @@ -125,9 +124,9 @@ Returns : A constant string, or NULL - -<anchor id="ogmdvd-get-audio-content-label" role="function"/>ogmdvd_get_audio_content_label () -ogmdvd_get_audio_content_labelconst gchar* ogmdvd_get_audio_content_label (gint content); + +ogmdvd_get_audio_content_label () +ogmdvd_get_audio_content_labelconst gchar* ogmdvd_get_audio_content_label (gint content); Returns a human readable audio content. @@ -139,9 +138,9 @@ Returns : A constant string, or NULL - -<anchor id="ogmdvd-get-subp-content-label" role="function"/>ogmdvd_get_subp_content_label () -ogmdvd_get_subp_content_labelconst gchar* ogmdvd_get_subp_content_label (gint content); + +ogmdvd_get_subp_content_label () +ogmdvd_get_subp_content_labelconst gchar* ogmdvd_get_subp_content_label (gint content); Returns a human readable subtitles content. @@ -153,9 +152,9 @@ Returns : A constant string, or NULL - -<anchor id="ogmdvd-get-language-label" role="function"/>ogmdvd_get_language_label () -ogmdvd_get_language_labelconst gchar* ogmdvd_get_language_label (gint code); + +ogmdvd_get_language_label () +ogmdvd_get_language_labelconst gchar* ogmdvd_get_language_label (gint code); Returns a human readable language. @@ -167,9 +166,9 @@ Returns : A constant string, or NULL - -<anchor id="ogmdvd-get-language-iso639-1" role="function"/>ogmdvd_get_language_iso639_1 () -ogmdvd_get_language_iso639_1const gchar* ogmdvd_get_language_iso639_1 (gint code); + +ogmdvd_get_language_iso639_1 () +ogmdvd_get_language_iso639_1const gchar* ogmdvd_get_language_iso639_1 (gint code); Returns an ISO 639-1 language. @@ -181,9 +180,9 @@ Returns : A constant string, or NULL - -<anchor id="ogmdvd-get-language-iso639-2" role="function"/>ogmdvd_get_language_iso639_2 () -ogmdvd_get_language_iso639_2const gchar* ogmdvd_get_language_iso639_2 (gint code); + +ogmdvd_get_language_iso639_2 () +ogmdvd_get_language_iso639_2const gchar* ogmdvd_get_language_iso639_2 (gint code); Returns an ISO 639-2 language. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-parser.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-parser.xml --- ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-parser.xml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-parser.xml 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,199 @@ + + + + + +Parser +3 +OGMDVD Library + + + +Parser +Parses the content of a DVD + + + + +Synopsis + + + +#include <ogmdvd-parser.h> + +enum OGMDvdParserStatus; +OGMDvdParser* ogmdvd_parser_new (OGMDvdTitle *title); +void ogmdvd_parser_ref (OGMDvdParser *parser); +void ogmdvd_parser_unref (OGMDvdParser *parser); +gint ogmdvd_parser_analyze (OGMDvdParser *parser, + guchar *buffer); +gint ogmdvd_parser_get_max_frames (OGMDvdParser *parser); +void ogmdvd_parser_set_max_frames (OGMDvdParser *parser, + gint max_frames); +gint ogmdvd_parser_get_audio_bitrate (OGMDvdParser *parser, + guint nr); + + + + + + + + + + + + +Description + + + + + + + + +Details + +enum OGMDvdParserStatus +OGMDvdParserStatustypedef enum +{ + OGMDVD_PARSER_STATUS_NONE, + OGMDVD_PARSER_STATUS_BITRATES, + OGMDVD_PARSER_STATUS_MAX_FRAMES +} OGMDvdParserStatus; + + +Status code returned by ogmdvd_parser_analyze() + + + + +OGMDVD_PARSER_STATUS_NONE + There is no information available yet + + + +OGMDVD_PARSER_STATUS_BITRATES + The bitrates of all the audio tracks are available + + + +OGMDVD_PARSER_STATUS_MAX_FRAMES + The maximum number of frames has been reached + + + + +ogmdvd_parser_new () +ogmdvd_parser_newOGMDvdParser* ogmdvd_parser_new (OGMDvdTitle *title); + +Creates a new OGMDvdParser. + + + +title : + An OGMDvdTitle + +Returns : The new OGMDvdParser, or NULL + + + +ogmdvd_parser_ref () +ogmdvd_parser_refvoid ogmdvd_parser_ref (OGMDvdParser *parser); + +Increments the reference count of an OGMDvdParser. + + + +parser : + An OGMDvdParser + + + +ogmdvd_parser_unref () +ogmdvd_parser_unrefvoid ogmdvd_parser_unref (OGMDvdParser *parser); + +Decrements the reference count of an OGMDvdParser. + + + +parser : + An OGMDvdParser + + + +ogmdvd_parser_analyze () +ogmdvd_parser_analyzegint ogmdvd_parser_analyze (OGMDvdParser *parser, + guchar *buffer); + +Analyzes the block contained in buffer. + + + +parser : + An OGMDvdParser + +buffer : + A buffer containing a block to analyze + +Returns : the status of the analysis + + + +ogmdvd_parser_get_max_frames () +ogmdvd_parser_get_max_framesgint ogmdvd_parser_get_max_frames (OGMDvdParser *parser); + +Returns the maximum number of frames to analyze. + + + +parser : + An OGMDvdParser + +Returns : The number of frames, -1 if the whole title is to be analyzed, 0 on error + + + +ogmdvd_parser_set_max_frames () +ogmdvd_parser_set_max_framesvoid ogmdvd_parser_set_max_frames (OGMDvdParser *parser, + gint max_frames); + +Sets the maximum number of frames to analyse. If max_frames is negative, +all the frames of the title will be analyzed. + + + +parser : + An OGMDvdParser + +max_frames : + A number of frames + + + +ogmdvd_parser_get_audio_bitrate () +ogmdvd_parser_get_audio_bitrategint ogmdvd_parser_get_audio_bitrate (OGMDvdParser *parser, + guint nr); + +Returns the bitrate of the audio stream at position nr, starting at 0. + + + +parser : + An OGMDvdParser + +nr : + The audio stream number + +Returns : The bitrate, or -1 + + + + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-reader.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-reader.xml --- ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-reader.xml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-reader.xml 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,164 @@ + + + + + +Reader +3 +OGMDVD Library + + + +Reader +Reads the content of a DVD + + + + +Synopsis + + + +#include <ogmdvd-reader.h> + +OGMDvdReader* ogmdvd_reader_new (OGMDvdTitle *title, + guint start_chap, + gint end_chap, + guint angle); +OGMDvdReader* ogmdvd_reader_new_by_cells (OGMDvdTitle *title, + guint start_cell, + gint end_cell, + guint angle); +void ogmdvd_reader_ref (OGMDvdReader *reader); +void ogmdvd_reader_unref (OGMDvdReader *reader); +gint ogmdvd_reader_get_block (OGMDvdReader *reader, + gsize len, + guchar *buffer); + + + + + + + + + + + + +Description + + + + + + + + +Details + +ogmdvd_reader_new () +ogmdvd_reader_newOGMDvdReader* ogmdvd_reader_new (OGMDvdTitle *title, + guint start_chap, + gint end_chap, + guint angle); + +Creates a new OGMDvdReader. + + + +title : + An OGMDvdTitle + +start_chap : + The chapter to start reading at, 0 for the first chapter + +end_chap : + The chapter to stop reading at, -1 for the last chapter + +angle : + The angle to read + +Returns : The new OGMDvdReader, or NULL + + + +ogmdvd_reader_new_by_cells () +ogmdvd_reader_new_by_cellsOGMDvdReader* ogmdvd_reader_new_by_cells (OGMDvdTitle *title, + guint start_cell, + gint end_cell, + guint angle); + +Creates a new OGMDvdReader. + + + +title : + An OGMDvdTitle + +start_cell : + The cell to start reading at, 0 for the first cell + +end_cell : + The cell to stop reading at, -1 for the last cell + +angle : + The angle to read + +Returns : The new OGMDvdReader, or NULL + + + +ogmdvd_reader_ref () +ogmdvd_reader_refvoid ogmdvd_reader_ref (OGMDvdReader *reader); + +Increments the reference count of an OGMDvdReader. + + + +reader : + An OGMDvdReader + + + +ogmdvd_reader_unref () +ogmdvd_reader_unrefvoid ogmdvd_reader_unref (OGMDvdReader *reader); + +Decrements the reference count of an OGMDvdReader. + + + +reader : + An OGMDvdReader + + + +ogmdvd_reader_get_block () +ogmdvd_reader_get_blockgint ogmdvd_reader_get_block (OGMDvdReader *reader, + gsize len, + guchar *buffer); + +Reads up to len blocks from the DVD into the buffer starting at buffer. + + + +reader : + An OGMDvdReader + +len : + The number of blocks to read + +buffer : + The buffer to store the blocks read + +Returns : The number of blocks read, or -1 + + + + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-stream.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-stream.xml --- ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-stream.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-stream.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMDvdStream +OGMDvdStream 3 OGMDVD Library @@ -15,17 +15,17 @@ - + Synopsis #include <ogmdvd-stream.h> - void ogmdvd_stream_ref (OGMDvdStream *stream); void ogmdvd_stream_unref (OGMDvdStream *stream); OGMDvdTitle* ogmdvd_stream_get_title (OGMDvdStream *stream); +gint ogmdvd_stream_get_id (OGMDvdStream *stream); gint ogmdvd_stream_get_nr (OGMDvdStream *stream); @@ -38,7 +38,7 @@ - + Description @@ -47,11 +47,11 @@ - + Details - -<anchor id="ogmdvd-stream-ref" role="function"/>ogmdvd_stream_ref () -ogmdvd_stream_refvoid ogmdvd_stream_ref (OGMDvdStream *stream); + +ogmdvd_stream_ref () +ogmdvd_stream_refvoid ogmdvd_stream_ref (OGMDvdStream *stream); Increments the reference count of an OGMDvdStream. @@ -61,9 +61,9 @@ An OGMDvdStream - -<anchor id="ogmdvd-stream-unref" role="function"/>ogmdvd_stream_unref () -ogmdvd_stream_unrefvoid ogmdvd_stream_unref (OGMDvdStream *stream); + +ogmdvd_stream_unref () +ogmdvd_stream_unrefvoid ogmdvd_stream_unref (OGMDvdStream *stream); Decrements the reference count of an OGMDvdStream. @@ -73,9 +73,9 @@ An OGMDvdStream - -<anchor id="ogmdvd-stream-get-title" role="function"/>ogmdvd_stream_get_title () -ogmdvd_stream_get_titleOGMDvdTitle* ogmdvd_stream_get_title (OGMDvdStream *stream); + +ogmdvd_stream_get_title () +ogmdvd_stream_get_titleOGMDvdTitle* ogmdvd_stream_get_title (OGMDvdStream *stream); Returns the title the OGMDvdStream belongs to @@ -87,9 +87,23 @@ Returns : An OGMDvdTitle, or NULL - -<anchor id="ogmdvd-stream-get-nr" role="function"/>ogmdvd_stream_get_nr () -ogmdvd_stream_get_nrgint ogmdvd_stream_get_nr (OGMDvdStream *stream); + +ogmdvd_stream_get_id () +ogmdvd_stream_get_idgint ogmdvd_stream_get_id (OGMDvdStream *stream); + +Returns the stream identifier. + + + +stream : + An OGMDvdStream + +Returns : The stream identifier, or -1 + + + +ogmdvd_stream_get_nr () +ogmdvd_stream_get_nrgint ogmdvd_stream_get_nr (OGMDvdStream *stream); Returns the stream number. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-subp.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-subp.xml --- ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-subp.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-subp.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMDvdSubp +OGMDvdSubp 3 OGMDVD Library @@ -15,14 +15,13 @@ - + Synopsis #include <ogmdvd-subp.h> - gint ogmdvd_subp_stream_get_language (OGMDvdSubpStream *subp); gint ogmdvd_subp_stream_get_content (OGMDvdSubpStream *subp); @@ -36,7 +35,7 @@ - + Description @@ -45,11 +44,11 @@ - + Details - -<anchor id="ogmdvd-subp-stream-get-language" role="function"/>ogmdvd_subp_stream_get_language () -ogmdvd_subp_stream_get_languagegint ogmdvd_subp_stream_get_language (OGMDvdSubpStream *subp); + +ogmdvd_subp_stream_get_language () +ogmdvd_subp_stream_get_languagegint ogmdvd_subp_stream_get_language (OGMDvdSubpStream *subp); Returns the language of the subtitles stream. @@ -61,9 +60,9 @@ Returns : The language code, or -1 - -<anchor id="ogmdvd-subp-stream-get-content" role="function"/>ogmdvd_subp_stream_get_content () -ogmdvd_subp_stream_get_contentgint ogmdvd_subp_stream_get_content (OGMDvdSubpStream *subp); + +ogmdvd_subp_stream_get_content () +ogmdvd_subp_stream_get_contentgint ogmdvd_subp_stream_get_content (OGMDvdSubpStream *subp); Returns the content of the subtitles stream. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-title.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-title.xml --- ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-title.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-title.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMDvdTitle +OGMDvdTitle 3 OGMDVD Library @@ -15,16 +15,16 @@ - + Synopsis #include <ogmdvd-title.h> - void ogmdvd_title_ref (OGMDvdTitle *title); void ogmdvd_title_unref (OGMDvdTitle *title); +gboolean ogmdvd_title_analyze (OGMDvdTitle *title); OGMDvdDisc* ogmdvd_title_get_disc (OGMDvdTitle *title); gint64 ogmdvd_title_get_vts_size (OGMDvdTitle *title); gint ogmdvd_title_get_nr (OGMDvdTitle *title); @@ -49,9 +49,11 @@ gint ogmdvd_title_get_n_audio_streams (OGMDvdTitle *title); OGMDvdAudioStream* ogmdvd_title_get_nth_audio_stream (OGMDvdTitle *title, guint nr); +GList* ogmdvd_title_get_audio_streams (OGMDvdTitle *title); gint ogmdvd_title_get_n_subp_streams (OGMDvdTitle *title); OGMDvdSubpStream* ogmdvd_title_get_nth_subp_stream (OGMDvdTitle *title, guint nr); +GList* ogmdvd_title_get_subp_streams (OGMDvdTitle *title); void ogmdvd_title_get_aspect_ratio (OGMDvdTitle *title, guint *numerator, guint *denominator); @@ -66,7 +68,7 @@ - + Description @@ -75,11 +77,11 @@ - + Details - -<anchor id="ogmdvd-title-ref" role="function"/>ogmdvd_title_ref () -ogmdvd_title_refvoid ogmdvd_title_ref (OGMDvdTitle *title); + +ogmdvd_title_ref () +ogmdvd_title_refvoid ogmdvd_title_ref (OGMDvdTitle *title); Increments the reference count of an OGMDvdTitle. @@ -89,9 +91,9 @@ An OGMDvdTitle - -<anchor id="ogmdvd-title-unref" role="function"/>ogmdvd_title_unref () -ogmdvd_title_unrefvoid ogmdvd_title_unref (OGMDvdTitle *title); + +ogmdvd_title_unref () +ogmdvd_title_unrefvoid ogmdvd_title_unref (OGMDvdTitle *title); Decrements the reference count of an OGMDvdTitle. @@ -101,9 +103,25 @@ An OGMDvdTitle - -<anchor id="ogmdvd-title-get-disc" role="function"/>ogmdvd_title_get_disc () -ogmdvd_title_get_discOGMDvdDisc* ogmdvd_title_get_disc (OGMDvdTitle *title); + +ogmdvd_title_analyze () +ogmdvd_title_analyzegboolean ogmdvd_title_analyze (OGMDvdTitle *title); + +Performs a depper analysis of the title to get more information about it and +its audio and subtitle streams. This function should be called multipled timeѕ +until the analysis is complete. + + + +title : + An OGMDvdTitle + +Returns : FALSE if the analysis if complete, TRUE otherwise + + + +ogmdvd_title_get_disc () +ogmdvd_title_get_discOGMDvdDisc* ogmdvd_title_get_disc (OGMDvdTitle *title); Returns the disc the OGMDvdTitle was opened from. @@ -115,9 +133,9 @@ Returns : The OGMDvdDisc, or NULL - -<anchor id="ogmdvd-title-get-vts-size" role="function"/>ogmdvd_title_get_vts_size () -ogmdvd_title_get_vts_sizegint64 ogmdvd_title_get_vts_size (OGMDvdTitle *title); + +ogmdvd_title_get_vts_size () +ogmdvd_title_get_vts_sizegint64 ogmdvd_title_get_vts_size (OGMDvdTitle *title); Returns the size of the video title set in bytes. @@ -129,9 +147,9 @@ Returns : The size in bytes, or -1 - -<anchor id="ogmdvd-title-get-nr" role="function"/>ogmdvd_title_get_nr () -ogmdvd_title_get_nrgint ogmdvd_title_get_nr (OGMDvdTitle *title); + +ogmdvd_title_get_nr () +ogmdvd_title_get_nrgint ogmdvd_title_get_nr (OGMDvdTitle *title); Returns the title number. @@ -143,9 +161,9 @@ Returns : The title number, or -1 - -<anchor id="ogmdvd-title-get-length" role="function"/>ogmdvd_title_get_length () -ogmdvd_title_get_lengthgdouble ogmdvd_title_get_length (OGMDvdTitle *title, + +ogmdvd_title_get_length () +ogmdvd_title_get_lengthgdouble ogmdvd_title_get_length (OGMDvdTitle *title, OGMDvdTime *length); Returns the title length in seconds. If length is not NULL, the data @@ -163,9 +181,9 @@ Returns : The length in seconds, or -1.0 - -<anchor id="ogmdvd-title-get-chapters-length" role="function"/>ogmdvd_title_get_chapters_length () -ogmdvd_title_get_chapters_lengthgdouble ogmdvd_title_get_chapters_length (OGMDvdTitle *title, + +ogmdvd_title_get_chapters_length () +ogmdvd_title_get_chapters_lengthgdouble ogmdvd_title_get_chapters_length (OGMDvdTitle *title, guint start, gint end, OGMDvdTime *length); @@ -191,9 +209,9 @@ Returns : The length in seconds, or -1.0 - -<anchor id="ogmdvd-title-get-framerate" role="function"/>ogmdvd_title_get_framerate () -ogmdvd_title_get_frameratevoid ogmdvd_title_get_framerate (OGMDvdTitle *title, + +ogmdvd_title_get_framerate () +ogmdvd_title_get_frameratevoid ogmdvd_title_get_framerate (OGMDvdTitle *title, guint *numerator, guint *denominator); @@ -211,9 +229,9 @@ A pointer to set the framerate denominator, or NULL - -<anchor id="ogmdvd-title-get-size" role="function"/>ogmdvd_title_get_size () -ogmdvd_title_get_sizevoid ogmdvd_title_get_size (OGMDvdTitle *title, + +ogmdvd_title_get_size () +ogmdvd_title_get_sizevoid ogmdvd_title_get_size (OGMDvdTitle *title, guint *width, guint *height); @@ -231,9 +249,9 @@ A pointer to set the height of the picture, or NULL - -<anchor id="ogmdvd-title-get-video-format" role="function"/>ogmdvd_title_get_video_format () -ogmdvd_title_get_video_formatgint ogmdvd_title_get_video_format (OGMDvdTitle *title); + +ogmdvd_title_get_video_format () +ogmdvd_title_get_video_formatgint ogmdvd_title_get_video_format (OGMDvdTitle *title); Returns the video format of the movie. @@ -245,9 +263,9 @@ Returns : OGMDvdVideoFormat, or -1 - -<anchor id="ogmdvd-title-get-display-aspect" role="function"/>ogmdvd_title_get_display_aspect () -ogmdvd_title_get_display_aspectgint ogmdvd_title_get_display_aspect (OGMDvdTitle *title); + +ogmdvd_title_get_display_aspect () +ogmdvd_title_get_display_aspectgint ogmdvd_title_get_display_aspect (OGMDvdTitle *title); Returns the display aspect of the movie. @@ -259,9 +277,9 @@ Returns : OGMDvdDisplayAspect, or -1 - -<anchor id="ogmdvd-title-get-display-format" role="function"/>ogmdvd_title_get_display_format () -ogmdvd_title_get_display_formatgint ogmdvd_title_get_display_format (OGMDvdTitle *title); + +ogmdvd_title_get_display_format () +ogmdvd_title_get_display_formatgint ogmdvd_title_get_display_format (OGMDvdTitle *title); Returns the display format of the movie. @@ -273,9 +291,9 @@ Returns : OGMDvdDisplayFormat, or -1 - -<anchor id="ogmdvd-title-get-palette" role="function"/>ogmdvd_title_get_palette () -ogmdvd_title_get_paletteguint* ogmdvd_title_get_palette (OGMDvdTitle *title); + +ogmdvd_title_get_palette () +ogmdvd_title_get_paletteguint* ogmdvd_title_get_palette (OGMDvdTitle *title); Returns the palette of the movie. @@ -287,9 +305,9 @@ Returns : a constant array of 16 integers, or NULL - -<anchor id="ogmdvd-title-get-n-angles" role="function"/>ogmdvd_title_get_n_angles () -ogmdvd_title_get_n_anglesgint ogmdvd_title_get_n_angles (OGMDvdTitle *title); + +ogmdvd_title_get_n_angles () +ogmdvd_title_get_n_anglesgint ogmdvd_title_get_n_angles (OGMDvdTitle *title); Returns the number of angles of the video title. @@ -301,9 +319,9 @@ Returns : The number of angles, or -1 - -<anchor id="ogmdvd-title-get-n-chapters" role="function"/>ogmdvd_title_get_n_chapters () -ogmdvd_title_get_n_chaptersgint ogmdvd_title_get_n_chapters (OGMDvdTitle *title); + +ogmdvd_title_get_n_chapters () +ogmdvd_title_get_n_chaptersgint ogmdvd_title_get_n_chapters (OGMDvdTitle *title); Returns the number of chapters of the video title. @@ -315,9 +333,9 @@ Returns : The number of chapters, or -1 - -<anchor id="ogmdvd-title-get-n-audio-streams" role="function"/>ogmdvd_title_get_n_audio_streams () -ogmdvd_title_get_n_audio_streamsgint ogmdvd_title_get_n_audio_streams (OGMDvdTitle *title); + +ogmdvd_title_get_n_audio_streams () +ogmdvd_title_get_n_audio_streamsgint ogmdvd_title_get_n_audio_streams (OGMDvdTitle *title); Returns the number of audio streams of the video title. @@ -329,9 +347,9 @@ Returns : The number of audio streams, or -1 - -<anchor id="ogmdvd-title-get-nth-audio-stream" role="function"/>ogmdvd_title_get_nth_audio_stream () -ogmdvd_title_get_nth_audio_streamOGMDvdAudioStream* ogmdvd_title_get_nth_audio_stream (OGMDvdTitle *title, + +ogmdvd_title_get_nth_audio_stream () +ogmdvd_title_get_nth_audio_streamOGMDvdAudioStream* ogmdvd_title_get_nth_audio_stream (OGMDvdTitle *title, guint nr); Returns the audio stream at position nr. The first nr is 0. @@ -347,9 +365,23 @@ Returns : The OGMDvdAudioStream, or NULL - -<anchor id="ogmdvd-title-get-n-subp-streams" role="function"/>ogmdvd_title_get_n_subp_streams () -ogmdvd_title_get_n_subp_streamsgint ogmdvd_title_get_n_subp_streams (OGMDvdTitle *title); + +ogmdvd_title_get_audio_streams () +ogmdvd_title_get_audio_streamsGList* ogmdvd_title_get_audio_streams (OGMDvdTitle *title); + +Returns a list of audio stream. + + + +title : + An OGMDvdTitle + +Returns : The GList, or NULL + + + +ogmdvd_title_get_n_subp_streams () +ogmdvd_title_get_n_subp_streamsgint ogmdvd_title_get_n_subp_streams (OGMDvdTitle *title); Returns the number of subtitles streams of the video title. @@ -361,9 +393,9 @@ Returns : The number of subtitles streams, or -1 - -<anchor id="ogmdvd-title-get-nth-subp-stream" role="function"/>ogmdvd_title_get_nth_subp_stream () -ogmdvd_title_get_nth_subp_streamOGMDvdSubpStream* ogmdvd_title_get_nth_subp_stream (OGMDvdTitle *title, + +ogmdvd_title_get_nth_subp_stream () +ogmdvd_title_get_nth_subp_streamOGMDvdSubpStream* ogmdvd_title_get_nth_subp_stream (OGMDvdTitle *title, guint nr); Returns the subtitles stream at position nr. The first nr is 0. @@ -379,9 +411,23 @@ Returns : The OGMDvdSubpStream, or NULL - -<anchor id="ogmdvd-title-get-aspect-ratio" role="function"/>ogmdvd_title_get_aspect_ratio () -ogmdvd_title_get_aspect_ratiovoid ogmdvd_title_get_aspect_ratio (OGMDvdTitle *title, + +ogmdvd_title_get_subp_streams () +ogmdvd_title_get_subp_streamsGList* ogmdvd_title_get_subp_streams (OGMDvdTitle *title); + +Returns a list of subp stream. + + + +title : + An OGMDvdTitle + +Returns : The GList, or NULL + + + +ogmdvd_title_get_aspect_ratio () +ogmdvd_title_get_aspect_ratiovoid ogmdvd_title_get_aspect_ratio (OGMDvdTitle *title, guint *numerator, guint *denominator); diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-types.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-types.xml --- ogmrip-0.11.1/docs/reference/ogmdvd/xml/ogmdvd-types.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd/xml/ogmdvd-types.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -Types +Types 3 OGMDVD Library @@ -15,19 +15,20 @@ - + Synopsis #include <ogmdvd-types.h> - OGMDvdDisc; OGMDvdTitle; OGMDvdStream; OGMDvdAudioStream; OGMDvdSubpStream; + OGMDvdReader; + OGMDvdParser; @@ -39,7 +40,7 @@ - + Description @@ -48,48 +49,64 @@ - + Details - -<anchor id="OGMDvdDisc" role="struct"/>OGMDvdDisc -OGMDvdDisctypedef struct _OGMDvdDisc OGMDvdDisc; + +OGMDvdDisc +OGMDvdDisctypedef struct _OGMDvdDisc OGMDvdDisc; An opaque structure representing a DVD disc - -<anchor id="OGMDvdTitle" role="struct"/>OGMDvdTitle -OGMDvdTitletypedef struct _OGMDvdTitle OGMDvdTitle; + +OGMDvdTitle +OGMDvdTitletypedef struct _OGMDvdTitle OGMDvdTitle; An opaque structure representing a DVD title - -<anchor id="OGMDvdStream" role="struct"/>OGMDvdStream -OGMDvdStreamtypedef struct _OGMDvdStream OGMDvdStream; + +OGMDvdStream +OGMDvdStreamtypedef struct _OGMDvdStream OGMDvdStream; An opaque structure representing a DVD stream - -<anchor id="OGMDvdAudioStream" role="struct"/>OGMDvdAudioStream -OGMDvdAudioStreamtypedef struct _OGMDvdAudioStream OGMDvdAudioStream; + +OGMDvdAudioStream +OGMDvdAudioStreamtypedef struct _OGMDvdAudioStream OGMDvdAudioStream; An opaque structure representing a DVD audio stream - -<anchor id="OGMDvdSubpStream" role="struct"/>OGMDvdSubpStream -OGMDvdSubpStreamtypedef struct _OGMDvdSubpStream OGMDvdSubpStream; + +OGMDvdSubpStream +OGMDvdSubpStreamtypedef struct _OGMDvdSubpStream OGMDvdSubpStream; An opaque structure representing a DVD subtitle stream + +OGMDvdReader +OGMDvdReadertypedef struct _OGMDvdReader OGMDvdReader; + +An opaque structure to read the content of a DVD + + + + +OGMDvdParser +OGMDvdParsertypedef struct _OGMDvdParser OGMDvdParser; + +An opaque structure to parse the content of a DVD + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/chapters.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/chapters.html --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/chapters.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/chapters.html 2008-09-28 19:28:16.000000000 +0200 @@ -1,16 +1,16 @@ - + Chapters - + - + - + - + @@ -27,8 +27,11 @@

Chapters

-OGMDvdChapterList — A widget that lists the chapters of a DVD title +OGMDvdChapterList — A widget that lists the chapters of a DVD title
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/dvd-drive.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/dvd-drive.html --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/dvd-drive.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/dvd-drive.html 2008-09-28 19:28:16.000000000 +0200 @@ -1,16 +1,16 @@ - + DVD Drive - + - - + + - + - + @@ -28,16 +28,19 @@ DVD Drive
-OGMDvdDriveChooser — DVD drive chooser interface used by OGMDvdDriveChooserDialog +OGMDvdDriveChooser — DVD drive chooser interface used by OGMDvdDriveChooserDialog and OGMDvdDriveChooserWidget
-OGMDvdDriveChooserWidget — DVD drive chooser widget that can be embedded in other widgets +OGMDvdDriveChooserWidget — DVD drive chooser widget that can be embedded in other widgets
-OGMDvdDriveChooserDialog — A DVD drive chooser dialog +OGMDvdDriveChooserDialog — A DVD drive chooser dialog
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/dvd-title.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/dvd-title.html --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/dvd-title.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/dvd-title.html 2008-09-28 19:28:16.000000000 +0200 @@ -1,16 +1,16 @@ - + DVD Title - + - + - + - + @@ -28,12 +28,15 @@ DVD Title
-OGMDvdTitleChooser — DVD title chooser interface used by OGMDvdTitleChooserWidget +OGMDvdTitleChooser — DVD title chooser interface used by OGMDvdTitleChooserWidget
-OGMDvdTitleChooserWidget — DVD title chooser widget that can be embedded in other widgets +OGMDvdTitleChooserWidget — DVD title chooser widget that can be embedded in other widgets
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/index.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/index.html --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/index.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/index.html 2008-09-28 19:28:16.000000000 +0200 @@ -1,19 +1,20 @@ - + OGMDvd Gtk+ Reference Manual - + - - + + - + -
+ +
@@ -27,30 +28,34 @@
DVD Drive
-OGMDvdDriveChooser — DVD drive chooser interface used by OGMDvdDriveChooserDialog +OGMDvdDriveChooser — DVD drive chooser interface used by OGMDvdDriveChooserDialog and OGMDvdDriveChooserWidget
-OGMDvdDriveChooserWidget — DVD drive chooser widget that can be embedded in other widgets +OGMDvdDriveChooserWidget — DVD drive chooser widget that can be embedded in other widgets
-OGMDvdDriveChooserDialog — A DVD drive chooser dialog +OGMDvdDriveChooserDialog — A DVD drive chooser dialog
DVD Title
-OGMDvdTitleChooser — DVD title chooser interface used by OGMDvdTitleChooserWidget +OGMDvdTitleChooser — DVD title chooser interface used by OGMDvdTitleChooserWidget
-OGMDvdTitleChooserWidget — DVD title chooser widget that can be embedded in other widgets +OGMDvdTitleChooserWidget — DVD title chooser widget that can be embedded in other widgets
Chapters
-OGMDvdChapterList — A widget that lists the chapters of a DVD title +OGMDvdChapterList — A widget that lists the chapters of a DVD title
-
+
+
+
+ Generated by GTK-Doc V1.10
+ diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/index.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/index.sgml --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/index.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/index.sgml 2008-09-28 19:28:14.000000000 +0200 @@ -1,27 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -29,4 +68,5 @@ + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/OGMDvdChapterList.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/OGMDvdChapterList.html --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/OGMDvdChapterList.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/OGMDvdChapterList.html 2008-09-28 19:28:16.000000000 +0200 @@ -1,15 +1,15 @@ - + OGMDvdChapterList - + - + - + @@ -21,49 +21,46 @@ Up Home OGMDvd Gtk+ Reference Manual -  +  -Top -  |  - Description -  |  - Object Hierarchy -  |  - Implemented Interfaces -  |  - Properties +Top +  |  + Description +  |  + Object Hierarchy +  |  + Implemented Interfaces +  |  + Properties
-

-OGMDvdChapterList -

-

OGMDvdChapterList — A widget that lists the chapters of a DVD title

+

OGMDvdChapterList

+

OGMDvdChapterList — A widget that lists the chapters of a DVD title
-

Synopsis

+

Synopsis

 
 #include <ogmdvd-chapter-list.h>
 
-
-                    OGMDvdChapterList;
+                    OGMDvdChapterList;
 GtkWidget*          ogmdvd_chapter_list_new             (void);
-void                ogmdvd_chapter_list_clear           (OGMDvdChapterList *list);
-void                ogmdvd_chapter_list_set_title       (OGMDvdChapterList *list,
+>GtkWidget*          ogmdvd_chapter_list_new             (void);
+void                ogmdvd_chapter_list_clear           (OGMDvdChapterList *list);
+void                ogmdvd_chapter_list_set_title       (OGMDvdChapterList *list,
                                                          OGMDvdTitle *title);
 OGMDvdTitle*        ogmdvd_chapter_list_get_title       (OGMDvdChapterList *list);
-void                ogmdvd_chapter_list_set_label       (OGMDvdChapterList *list,
+href="/usr/share/gtk-doc/html/ogmdvd/ogmdvd-ogmdvd-types.html#OGMDvdTitle"
+>OGMDvdTitle*        ogmdvd_chapter_list_get_title       (OGMDvdChapterList *list);
+void                ogmdvd_chapter_list_set_label       (OGMDvdChapterList *list,
                                                          guint chapter,
@@ -72,17 +69,15 @@
 >gchar *label);
 gchar*              ogmdvd_chapter_list_get_label       (OGMDvdChapterList *list,
+>gchar*              ogmdvd_chapter_list_get_label       (OGMDvdChapterList *list,
                                                          guint chapter);
-
-

Object Hierarchy

+

Object Hierarchy

-
   GObject
@@ -105,7 +100,7 @@
-

Implemented Interfaces

+

Implemented Interfaces

OGMDvdChapterList implements AtkImplementorIface and GtkBuildable.

-

Properties

+

Properties

-
-  "title"                    title"                    gpointer              : Read / Write
-

Description

+

Description

@@ -130,66 +124,62 @@

-

Details

+

Details

-

-OGMDvdChapterList

-
typedef struct _OGMDvdChapterList OGMDvdChapterList;
+

OGMDvdChapterList

+
typedef struct _OGMDvdChapterList OGMDvdChapterList;

-

-ogmdvd_chapter_list_new ()

-
ogmdvd_chapter_list_new ()

+
GtkWidget*          ogmdvd_chapter_list_new             (void);

 

-Creates a new empty OGMDvdChapterList.

+Creates a new empty OGMDvdChapterList.

 

 
 

 

-
-
+

 
 
Returns : The new OGMDvdChapterList
+
Returns :
 The new OGMDvdChapterList
-

-ogmdvd_chapter_list_clear ()

-
void                ogmdvd_chapter_list_clear           (OGMDvdChapterList *list);
+

ogmdvd_chapter_list_clear ()

+
void                ogmdvd_chapter_list_clear           (OGMDvdChapterList *list);

-Removes all entries of the OGMDvdChapterList.

+Removes all entries of the OGMDvdChapterList.

- - +
list : An OGMDvdChapterList +

list :

 An OGMDvdChapterList
-

-ogmdvd_chapter_list_set_title ()

-
void                ogmdvd_chapter_list_set_title       (OGMDvdChapterList *list,
+
ogmdvd_chapter_list_set_title ()

+
void                ogmdvd_chapter_list_set_title       (OGMDvdChapterList *list,
                                                          OGMDvdTitle *title);

 

 Adds to the list the chapters of the given OGMDvdTitle.

 

 
@@ -198,14 +188,14 @@
 
 
 
-list :
- An OGMDvdChapterList
+
list :

+ An OGMDvdChapterList
 
 
 
-title :
+
title :

  An OGMDvdTitle
 
 
@@ -214,15 +204,14 @@
-

-ogmdvd_chapter_list_get_title ()

-
OGMDvdTitle*        ogmdvd_chapter_list_get_title       (OGMDvdChapterList *list);
+

ogmdvd_chapter_list_get_title ()

+
OGMDvdTitle*        ogmdvd_chapter_list_get_title       (OGMDvdChapterList *list);

Returns the OGMDvdTitle which was passed to ogmdvd_chapter_list_set_title().

+href="/usr/share/gtk-doc/html/ogmdvd/ogmdvd-ogmdvd-types.html#OGMDvdTitle" +>OGMDvdTitle which was passed to ogmdvd_chapter_list_set_title().

@@ -230,14 +219,14 @@ -list : - An OGMDvdChapterList +

list :

+ An OGMDvdChapterList -Returns : +

Returns :

An OGMDvdTitle @@ -246,9 +235,8 @@
-

-ogmdvd_chapter_list_set_label ()

-
void                ogmdvd_chapter_list_set_label       (OGMDvdChapterList *list,
+
ogmdvd_chapter_list_set_label ()

+
void                ogmdvd_chapter_list_set_label       (OGMDvdChapterList *list,
                                                          guint chapter,
@@ -264,17 +252,17 @@
 
 
 
-list :
- An OGMDvdChapterList
+
list :

+ An OGMDvdChapterList
 
 
 
-chapter :
+
chapter :

  A chapter number
 
 
 
-label :
+
label :

  The label of the chapter
 
 
@@ -283,11 +271,10 @@
-

-ogmdvd_chapter_list_get_label ()

-
ogmdvd_chapter_list_get_label ()

+
gchar*              ogmdvd_chapter_list_get_label       (OGMDvdChapterList *list,
+>gchar*              ogmdvd_chapter_list_get_label       (OGMDvdChapterList *list,
                                                          guint chapter);

@@ -300,17 +287,17 @@
 
 
 
-list :
- An OGMDvdChapterList
+
list :

+ An OGMDvdChapterList
 
 
 
-chapter :
+
chapter :

  A chapter number
 
 
 
-Returns :
+
Returns :

  The chapter's label
 
 
@@ -319,16 +306,18 @@
-

Property Details

+

Property Details

-

-The "title" property

-
  "title"                    
The "title" property

+
  "title"                    gpointer              : Read / Write

 
The DVD title.
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/OGMDvdDriveChooserDialog.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/OGMDvdDriveChooserDialog.html --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/OGMDvdDriveChooserDialog.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/OGMDvdDriveChooserDialog.html 2008-09-28 19:28:16.000000000 +0200 @@ -1,16 +1,16 @@ - + OGMDvdDriveChooserDialog - + - + - + @@ -24,45 +24,40 @@ OGMDvd Gtk+ Reference Manual Next -Top -  |  - Description -  |  - Object Hierarchy -  |  - Implemented Interfaces -  |  - Signals +Top +  |  + Description +  |  + Object Hierarchy +  |  + Implemented Interfaces +  |  + Signals
-

-OGMDvdDriveChooserDialog -

-

OGMDvdDriveChooserDialog — A DVD drive chooser dialog

+

OGMDvdDriveChooserDialog

+

OGMDvdDriveChooserDialog — A DVD drive chooser dialog
-

Synopsis

+

Synopsis

 
 #include <ogmdvd-drive-chooser-dialog.h>
 
-
-                    OGMDvdDriveChooserDialog;
+                    OGMDvdDriveChooserDialog;
 GtkWidget*          ogmdvd_drive_chooser_dialog_new     (void);
-
+>GtkWidget*          ogmdvd_drive_chooser_dialog_new     (void);
-

Object Hierarchy

+

Object Hierarchy

-
   GObject
@@ -91,22 +86,21 @@
-

Implemented Interfaces

+

Implemented Interfaces

OGMDvdDriveChooserDialog implements AtkImplementorIface, GtkBuildable and OGMDvdDriveChooser.

+>GtkBuildable and OGMDvdDriveChooser.

-

Signals

+

Signals

-
-  "eject"                                          : Run Last / No Recursion / No Hooks
+  "eject"                                          : Run Last / No Recursion / No Hooks
-

Description

+

Description

@@ -114,43 +108,40 @@

-

Details

+

Details

-

-OGMDvdDriveChooserDialog

-
typedef struct _OGMDvdDriveChooserDialog OGMDvdDriveChooserDialog;
+

OGMDvdDriveChooserDialog

+
typedef struct _OGMDvdDriveChooserDialog OGMDvdDriveChooserDialog;

-

-ogmdvd_drive_chooser_dialog_new ()

-
ogmdvd_drive_chooser_dialog_new ()

+
GtkWidget*          ogmdvd_drive_chooser_dialog_new     (void);

 

-Creates a new OGMDvdDriveChooserDialog.

+Creates a new OGMDvdDriveChooserDialog.

 

 
 

 

-
-
+

 
 
Returns : The new OGMDvdDriveChooserDialog
+
Returns :
 The new OGMDvdDriveChooserDialog
-

Signal Details

+

Signal Details

-

-The "eject" signal

-
void                user_function                      (OGMDvdDriveChooserDialog *dialog,
+
The "eject" signal

+
void                user_function                      (OGMDvdDriveChooserDialog *dialog,
                                                         gpointer                  user_data)      : Run Last / No Recursion / No Hooks

@@ -163,12 +154,12 @@
 
 
 
-dialog :
+
dialog :

  the widget that received the signal
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -176,5 +167,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/OGMDvdDriveChooserWidget.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/OGMDvdDriveChooserWidget.html --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/OGMDvdDriveChooserWidget.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/OGMDvdDriveChooserWidget.html 2008-09-28 19:28:16.000000000 +0200 @@ -1,16 +1,16 @@ - + OGMDvdDriveChooserWidget - + - + - + @@ -24,43 +24,38 @@ OGMDvd Gtk+ Reference Manual Next -Top -  |  - Description -  |  - Object Hierarchy -  |  - Implemented Interfaces +Top +  |  + Description +  |  + Object Hierarchy +  |  + Implemented Interfaces
-

-OGMDvdDriveChooserWidget -

-

OGMDvdDriveChooserWidget — DVD drive chooser widget that can be embedded in other widgets

+

OGMDvdDriveChooserWidget

+

OGMDvdDriveChooserWidget — DVD drive chooser widget that can be embedded in other widgets
-

Synopsis

+

Synopsis

 
 #include <ogmdvd-drive-chooser-widget.h>
 
-
-                    OGMDvdDriveChooserWidget;
+                    OGMDvdDriveChooserWidget;
 GtkWidget*          ogmdvd_drive_chooser_widget_new     (void);
-
+>GtkWidget*          ogmdvd_drive_chooser_widget_new     (void);
-

Object Hierarchy

+

Object Hierarchy

-
   GObject
@@ -86,19 +81,19 @@
-

Implemented Interfaces

+

Implemented Interfaces

OGMDvdDriveChooserWidget implements AtkImplementorIface, GtkBuildable, OGMDvdDriveChooser, GtkBuildable, OGMDvdDriveChooser, GtkCellLayout and GtkCellEditable.

-

Description

+

Description

@@ -106,37 +101,38 @@

-

Details

+

Details

-

-OGMDvdDriveChooserWidget

-
typedef struct _OGMDvdDriveChooserWidget OGMDvdDriveChooserWidget;
+

OGMDvdDriveChooserWidget

+
typedef struct _OGMDvdDriveChooserWidget OGMDvdDriveChooserWidget;

-

-ogmdvd_drive_chooser_widget_new ()

-
ogmdvd_drive_chooser_widget_new ()

+
GtkWidget*          ogmdvd_drive_chooser_widget_new     (void);

 

-Creates a new OGMDvdDriveChooserWidget.

+Creates a new OGMDvdDriveChooserWidget.

 

 
 

 

-
-
+

 
 
Returns : The new OGMDvdDriveChooserWidget
+
Returns :
 The new OGMDvdDriveChooserWidget
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/ogmdvd-gtk-lib.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/ogmdvd-gtk-lib.html --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/ogmdvd-gtk-lib.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/ogmdvd-gtk-lib.html 2008-09-28 19:28:16.000000000 +0200 @@ -1,16 +1,16 @@ - -Part I. OGMDvd Gtk+ Library Reference - + +Part I. OGMDvd Gtk+ Library Reference + - + - + @@ -18,19 +18,53 @@ - +

-Part I. OGMDvd Gtk+ Library Reference

+Part I. OGMDvd Gtk+ Library Reference

This section contains the API reference for OGMDvd Gtk+. All the public interfaces are documented here.

+
+

Table of Contents

+
+
DVD Drive
+
+
+OGMDvdDriveChooser — DVD drive chooser interface used by OGMDvdDriveChooserDialog + and OGMDvdDriveChooserWidget +
+
+OGMDvdDriveChooserWidget — DVD drive chooser widget that can be embedded in other widgets +
+
+OGMDvdDriveChooserDialog — A DVD drive chooser dialog +
+
+
DVD Title
+
+
+OGMDvdTitleChooser — DVD title chooser interface used by OGMDvdTitleChooserWidget +
+
+OGMDvdTitleChooserWidget — DVD title chooser widget that can be embedded in other widgets +
+
+
Chapters
+
+OGMDvdChapterList — A widget that lists the chapters of a DVD title +
+
+ +
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/ogmdvd-gtk-ogmdvd-drive-chooser.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/ogmdvd-gtk-ogmdvd-drive-chooser.html --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/ogmdvd-gtk-ogmdvd-drive-chooser.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/ogmdvd-gtk-ogmdvd-drive-chooser.html 2008-09-28 19:28:16.000000000 +0200 @@ -1,16 +1,16 @@ - + OGMDvdDriveChooser - + - + - + @@ -24,52 +24,47 @@ OGMDvd Gtk+ Reference Manual Next -Top -  |  - Description -  |  - Object Hierarchy -  |  - Prerequisites -  |  - Known Implementations -  |  - Signals +Top +  |  + Description +  |  + Object Hierarchy +  |  + Prerequisites +  |  + Known Implementations +  |  + Signals
-

-OGMDvdDriveChooser -

-

OGMDvdDriveChooser — DVD drive chooser interface used by OGMDvdDriveChooserDialog +

OGMDvdDriveChooser

+

OGMDvdDriveChooser — DVD drive chooser interface used by OGMDvdDriveChooserDialog and OGMDvdDriveChooserWidget
-

Synopsis

+

Synopsis

 
 #include <ogmdvd-drive-chooser.h>
 
-
-                    OGMDvdDriveChooser;
-NautilusBurnDrive*  ogmdvd_drive_chooser_get_drive      (OGMDvdDriveChooser *chooser);
-
+                    OGMDvdDriveChooser;
+NautilusBurnDrive*  ogmdvd_drive_chooser_get_drive      (OGMDvdDriveChooser *chooser);
-

Object Hierarchy

+

Object Hierarchy

-
   GInterface
    +----OGMDvdDriveChooser
-

Prerequisites

+

Prerequisites

OGMDvdDriveChooser requires GtkWidget.

-

Known Implementations

+

Known Implementations

OGMDvdDriveChooser is implemented by - OGMDvdDriveChooserDialog and OGMDvdDriveChooserWidget.

+ OGMDvdDriveChooserDialog and OGMDvdDriveChooserWidget.

-

Signals

+

Signals

-
-  "device-changed"                                 : Run Last / No Recursion / No Hooks
+  "device-changed"                                 : Run Last / No Recursion / No Hooks
-

Description

+

Description

@@ -98,20 +92,18 @@

-

Details

+

Details

-

-OGMDvdDriveChooser

-
typedef struct _OGMDvdDriveChooser OGMDvdDriveChooser;
+

OGMDvdDriveChooser

+
typedef struct _OGMDvdDriveChooser OGMDvdDriveChooser;

-

-ogmdvd_drive_chooser_get_drive ()

-
NautilusBurnDrive*  ogmdvd_drive_chooser_get_drive      (OGMDvdDriveChooser *chooser);
+

ogmdvd_drive_chooser_get_drive ()

+
NautilusBurnDrive*  ogmdvd_drive_chooser_get_drive      (OGMDvdDriveChooser *chooser);

Returns the selected NautilusBurnDrive.

@@ -121,12 +113,12 @@ -chooser : - An OGMDvdDriveChooser +

chooser :

+ An OGMDvdDriveChooser -Returns : +

Returns :

A NautilusBurnDrive @@ -135,11 +127,10 @@
-

Signal Details

+

Signal Details

-

-The "device-changed" signal

-
void                user_function                      (OGMDvdDriveChooser *chooser,
+
The "device-changed" signal

+
void                user_function                      (OGMDvdDriveChooser *chooser,
                                                         gchar              *device,
@@ -155,17 +146,17 @@
 
 
 
-chooser :
+
chooser :

  the widget that received the signal
 
 
 
-device :
+
device :

  the DVD device
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -173,5 +164,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/ogmdvd-gtk-ogmdvd-title-chooser.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/ogmdvd-gtk-ogmdvd-title-chooser.html --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/ogmdvd-gtk-ogmdvd-title-chooser.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/ogmdvd-gtk-ogmdvd-title-chooser.html 2008-09-28 19:28:16.000000000 +0200 @@ -1,16 +1,16 @@ - + OGMDvdTitleChooser - + - + - + @@ -24,60 +24,55 @@ OGMDvd Gtk+ Reference Manual Next -Top -  |  - Description -  |  - Object Hierarchy -  |  - Prerequisites -  |  - Known Implementations -  |  - Properties +Top +  |  + Description +  |  + Object Hierarchy +  |  + Prerequisites +  |  + Known Implementations +  |  + Properties
-

-OGMDvdTitleChooser -

-

OGMDvdTitleChooser — DVD title chooser interface used by OGMDvdTitleChooserWidget

+

OGMDvdTitleChooser

+

OGMDvdTitleChooser — DVD title chooser interface used by OGMDvdTitleChooserWidget
-

Synopsis

+

Synopsis

 
 #include <ogmdvd-title-chooser.h>
 
-
-                    OGMDvdTitleChooser;
-void                ogmdvd_title_chooser_set_disc       (OGMDvdTitleChooser *chooser,
+                    OGMDvdTitleChooser;
+void                ogmdvd_title_chooser_set_disc       (OGMDvdTitleChooser *chooser,
                                                          OGMDvdDisc *disc);
 OGMDvdDisc*         ogmdvd_title_chooser_get_disc       (OGMDvdTitleChooser *chooser);
+href="/usr/share/gtk-doc/html/ogmdvd/ogmdvd-ogmdvd-types.html#OGMDvdDisc"
+>OGMDvdDisc*         ogmdvd_title_chooser_get_disc       (OGMDvdTitleChooser *chooser);
 OGMDvdTitle*        ogmdvd_title_chooser_get_active     (OGMDvdTitleChooser *chooser);
-
+href="/usr/share/gtk-doc/html/ogmdvd/ogmdvd-ogmdvd-types.html#OGMDvdTitle"
+>OGMDvdTitle*        ogmdvd_title_chooser_get_active     (OGMDvdTitleChooser *chooser);
-

Object Hierarchy

+

Object Hierarchy

-
   GInterface
    +----OGMDvdTitleChooser
-

Prerequisites

+

Prerequisites

OGMDvdTitleChooser requires GtkWidget.

-

Known Implementations

+

Known Implementations

OGMDvdTitleChooser is implemented by - OGMDvdTitleChooserWidget.

+ OGMDvdTitleChooserWidget.

-

Properties

+

Properties

-
-  "disc"                     disc"                     gpointer              : Read / Write
-  "title"                    title"                    gpointer              : Read
-

Description

+

Description

@@ -111,26 +105,24 @@

-

Details

+

Details

-

-OGMDvdTitleChooser

-
typedef struct _OGMDvdTitleChooser OGMDvdTitleChooser;
+

OGMDvdTitleChooser

+
typedef struct _OGMDvdTitleChooser OGMDvdTitleChooser;

-

-ogmdvd_title_chooser_set_disc ()

-
void                ogmdvd_title_chooser_set_disc       (OGMDvdTitleChooser *chooser,
+
ogmdvd_title_chooser_set_disc ()

+
void                ogmdvd_title_chooser_set_disc       (OGMDvdTitleChooser *chooser,
                                                          OGMDvdDisc *disc);

 

 Sets the OGMDvdDisc to select the title from.

 

 
@@ -139,14 +131,14 @@
 
 
 
-chooser :
- An OGMDvdTitleChooser
+
chooser :

+ An OGMDvdTitleChooser
 
 
 
-disc :
+
disc :

  An OGMDvdDisc
 
 
@@ -155,15 +147,14 @@
-

-ogmdvd_title_chooser_get_disc ()

-
OGMDvdDisc*         ogmdvd_title_chooser_get_disc       (OGMDvdTitleChooser *chooser);
+

ogmdvd_title_chooser_get_disc ()

+
OGMDvdDisc*         ogmdvd_title_chooser_get_disc       (OGMDvdTitleChooser *chooser);

Returns the OGMDvdDisc which was passed to ogmdvd_title_chooser_set_disc().

+href="/usr/share/gtk-doc/html/ogmdvd/ogmdvd-ogmdvd-types.html#OGMDvdDisc" +>OGMDvdDisc which was passed to ogmdvd_title_chooser_set_disc().

@@ -171,14 +162,14 @@ -chooser : - An OGMDvdTitleChooser +

chooser :

+ An OGMDvdTitleChooser -Returns : +

Returns :

The current OGMDvdDisc @@ -187,14 +178,13 @@
-

-ogmdvd_title_chooser_get_active ()

-
OGMDvdTitle*        ogmdvd_title_chooser_get_active     (OGMDvdTitleChooser *chooser);
+

ogmdvd_title_chooser_get_active ()

+
OGMDvdTitle*        ogmdvd_title_chooser_get_active     (OGMDvdTitleChooser *chooser);

Returns the active OGMDvdTitle.

@@ -203,14 +193,14 @@ -chooser : - An OGMDvdTitleChooser +

chooser :

+ An OGMDvdTitleChooser -Returns : +

Returns :

The active OGMDvdTitle @@ -219,25 +209,26 @@
-

Property Details

+

Property Details

-

-The "disc" property

-
  "disc"                     
The "disc" property

+
  "disc"                     gpointer              : Read / Write

 
The DVD disc.
-

-The "title" property

-
  "title"                    
The "title" property

+
  "title"                    gpointer              : Read

 
The active DVD title.
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/OGMDvdTitleChooserWidget.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/OGMDvdTitleChooserWidget.html --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/OGMDvdTitleChooserWidget.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/OGMDvdTitleChooserWidget.html 2008-09-28 19:28:16.000000000 +0200 @@ -1,16 +1,16 @@ - + OGMDvdTitleChooserWidget - + - + - + @@ -24,43 +24,38 @@ OGMDvd Gtk+ Reference Manual Next -Top -  |  - Description -  |  - Object Hierarchy -  |  - Implemented Interfaces +Top +  |  + Description +  |  + Object Hierarchy +  |  + Implemented Interfaces
-

-OGMDvdTitleChooserWidget -

-

OGMDvdTitleChooserWidget — DVD title chooser widget that can be embedded in other widgets

+

OGMDvdTitleChooserWidget

+

OGMDvdTitleChooserWidget — DVD title chooser widget that can be embedded in other widgets
-

Synopsis

+

Synopsis

 
 #include <ogmdvd-title-chooser-widget.h>
 
-
-                    OGMDvdTitleChooserWidget;
+                    OGMDvdTitleChooserWidget;
 GtkWidget*          ogmdvd_title_chooser_widget_new     (void);
-
+>GtkWidget*          ogmdvd_title_chooser_widget_new     (void);
-

Object Hierarchy

+

Object Hierarchy

-
   GObject
@@ -86,7 +81,7 @@
-

Implemented Interfaces

+

Implemented Interfaces

OGMDvdTitleChooserWidget implements AtkImplementorIface, GtkCellLayout, GtkCellEditable and OGMDvdTitleChooser.

+>GtkCellEditable and OGMDvdTitleChooser.

-

Description

+

Description

@@ -106,37 +101,38 @@

-

Details

+

Details

-

-OGMDvdTitleChooserWidget

-
typedef struct _OGMDvdTitleChooserWidget OGMDvdTitleChooserWidget;
+

OGMDvdTitleChooserWidget

+
typedef struct _OGMDvdTitleChooserWidget OGMDvdTitleChooserWidget;

-

-ogmdvd_title_chooser_widget_new ()

-
ogmdvd_title_chooser_widget_new ()

+
GtkWidget*          ogmdvd_title_chooser_widget_new     (void);

 

-Creates a new OGMDvdTitleChooserWidget.

+Creates a new OGMDvdTitleChooserWidget.

 

 
 

 

-
-
+

 
 
Returns : The new OGMDvdTitleChooserWidget
+
Returns :
 The new OGMDvdTitleChooserWidget
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/style.css /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/style.css --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/html/style.css 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/html/style.css 2008-09-28 19:28:14.000000000 +0200 @@ -1,16 +1,16 @@ -.synopsis, .classsynopsis +.synopsis, .classsynopsis { background: #eeeeee; border: solid 1px #aaaaaa; padding: 0.5em; } -.programlisting +.programlisting { background: #eeeeff; border: solid 1px #aaaaff; padding: 0.5em; } -.variablelist +.variablelist { padding: 4px; margin-left: 3em; @@ -19,62 +19,93 @@ { vertical-align: top; } + /* this is needed so that the local anchors are displayed below the naviagtion */ -div.refnamediv a[name], div.refsect1 a[name] -{ - position: relative; - top: -4.5em; -} -table.navigation#top -{ - background: #ffeeee; - border: solid 1px #ffaaaa; - margin-top: 0; - margin-bottom: 0; - position: fixed; - top: 0; - left: 0; - height: 2em; - z-index: 1; +@media screen { + sup a.footnote + { + position: relative; + top: 0em ! important; + } + div.refnamediv a[name], div.refsect1 a[name] + { + position: relative; + top: -4.5em; + } + table.navigation#top + { + background: #ffeeee; + border: solid 1px #ffaaaa; + margin-top: 0; + margin-bottom: 0; + position: fixed; + top: 0; + left: 0; + height: 2em; + z-index: 1; + } + .navigation a + { + color: #770000; + } + .navigation a:visited + { + color: #550000; + } + td.shortcuts + { + color: #770000; + font-size: 80%; + } + div.refentry, div.chapter, div.reference, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface + { + position: relative; + top: 3em; + z-index: 0; + } + div.refnamediv + { + margin-top: 2em; + } + body + { + padding-bottom: 20em; + } +} +@media print { + table.navigation { + visibility: collapse; + display: none; + } + div.titlepage table.navigation { + visibility: visible; + display: table; + background: #ffeeee; + border: solid 1px #ffaaaa; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + height: 2em; + } } -.navigation a -{ - color: #770000; -} -.navigation a:visited -{ - color: #550000; -} -.navigation .title + +.navigation .title { font-size: 200%; } -td.shortcuts -{ - color: #770000; - font-size: 80%; -} -div.refentry, div.chapter, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface -{ - position: relative; - top: 3em; - z-index: 0; -} -div.refnamediv -{ - margin-top: 2em; -} -div.gallery-float + +div.gallery-float { float: left; padding: 10px; } -div.gallery-float img +div.gallery-float img { border-style: none; } -div.gallery-spacer +div.gallery-spacer { clear: both; } @@ -110,3 +141,20 @@ { background-color: #eeeeee; } + +hr +{ + color: #777777; + background: #777777; + border: 0; + height: 1px; + clear: both; +} + +.footer +{ + padding-top: 3.5em; + color: #777777; + text-align: center; + font-size: 80%; +} diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/Makefile.am /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/Makefile.am --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/Makefile.am 2007-10-07 21:03:53.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/Makefile.am 2008-07-15 23:27:13.000000000 +0200 @@ -14,14 +14,14 @@ include $(top_srcdir)/gtk-doc.make CFLAGS = \ - $(OGMRIP_CFLAGS) $(GUI_CFLAGS) \ + $(OGMRIP_CFLAGS) $(GUI_CFLAGS) \ -I$(top_srcdir)/libogmdvd \ -I$(top_srcdir)/libogmdvd-gtk \ -I$(top_srcdir)/libbacon LDFLAGS = -lstdc++ \ - $(OGMRIP_LIBS) $(HAL_LIBS) $(HAL5_LIBS) \ - $(top_builddir)/libogmdvd/libogmdvd.la \ - $(top_builddir)/libogmdvd-gtk/libogmdvd-gtk.la \ - $(top_builddir)/libbacon/libbacon.a + $(top_builddir)/libogmdvd/libogmdvd.la \ + $(top_builddir)/libogmdvd-gtk/libogmdvd-gtk.la \ + $(top_builddir)/libbacon/libbacon.a \ + $(OGMRIP_LIBS) $(HAL_LIBS) diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/Makefile.in /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/Makefile.in --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/Makefile.in 2007-10-21 21:05:55.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/Makefile.in 2008-09-21 14:16:34.000000000 +0200 @@ -45,8 +45,7 @@ $(top_srcdir)/gtk-doc.make subdir = docs/reference/ogmdvd-gtk ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -70,7 +69,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = \ - $(OGMRIP_CFLAGS) $(GUI_CFLAGS) \ + $(OGMRIP_CFLAGS) $(GUI_CFLAGS) \ -I$(top_srcdir)/libogmdvd \ -I$(top_srcdir)/libogmdvd-gtk \ -I$(top_srcdir)/libbacon @@ -85,6 +84,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ DVDREAD_LIBS = @DVDREAD_LIBS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -98,7 +98,6 @@ ENCHANT_LIBS = @ENCHANT_LIBS@ EXEEXT = @EXEEXT@ F77 = @F77@ -FAAC_PROG = @FAAC_PROG@ FFLAGS = @FFLAGS@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ @@ -109,8 +108,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GOCR_PROG = @GOCR_PROG@ GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ GUI_CFLAGS = @GUI_CFLAGS@ @@ -119,24 +118,38 @@ HAL_LIBS = @HAL_LIBS@ HAVE_AAC_SUPPORT_FALSE = @HAVE_AAC_SUPPORT_FALSE@ HAVE_AAC_SUPPORT_TRUE = @HAVE_AAC_SUPPORT_TRUE@ -HAVE_DTS_SUPPORT_FALSE = @HAVE_DTS_SUPPORT_FALSE@ -HAVE_DTS_SUPPORT_TRUE = @HAVE_DTS_SUPPORT_TRUE@ HAVE_ENCHANT_SUPPORT_FALSE = @HAVE_ENCHANT_SUPPORT_FALSE@ HAVE_ENCHANT_SUPPORT_TRUE = @HAVE_ENCHANT_SUPPORT_TRUE@ HAVE_GTK_SUPPORT_FALSE = @HAVE_GTK_SUPPORT_FALSE@ HAVE_GTK_SUPPORT_TRUE = @HAVE_GTK_SUPPORT_TRUE@ +HAVE_LAVC_SUPPORT_FALSE = @HAVE_LAVC_SUPPORT_FALSE@ +HAVE_LAVC_SUPPORT_TRUE = @HAVE_LAVC_SUPPORT_TRUE@ HAVE_LAVF_SUPPORT_FALSE = @HAVE_LAVF_SUPPORT_FALSE@ HAVE_LAVF_SUPPORT_TRUE = @HAVE_LAVF_SUPPORT_TRUE@ HAVE_MKV_SUPPORT_FALSE = @HAVE_MKV_SUPPORT_FALSE@ HAVE_MKV_SUPPORT_TRUE = @HAVE_MKV_SUPPORT_TRUE@ +HAVE_MP3_SUPPORT_FALSE = @HAVE_MP3_SUPPORT_FALSE@ +HAVE_MP3_SUPPORT_TRUE = @HAVE_MP3_SUPPORT_TRUE@ +HAVE_MP4_SUPPORT_FALSE = @HAVE_MP4_SUPPORT_FALSE@ +HAVE_MP4_SUPPORT_TRUE = @HAVE_MP4_SUPPORT_TRUE@ +HAVE_OGM_SUPPORT_FALSE = @HAVE_OGM_SUPPORT_FALSE@ +HAVE_OGM_SUPPORT_TRUE = @HAVE_OGM_SUPPORT_TRUE@ +HAVE_PNG_SUPPORT_FALSE = @HAVE_PNG_SUPPORT_FALSE@ +HAVE_PNG_SUPPORT_TRUE = @HAVE_PNG_SUPPORT_TRUE@ HAVE_SRT_SUPPORT_FALSE = @HAVE_SRT_SUPPORT_FALSE@ HAVE_SRT_SUPPORT_TRUE = @HAVE_SRT_SUPPORT_TRUE@ HAVE_THEORA_SUPPORT_FALSE = @HAVE_THEORA_SUPPORT_FALSE@ HAVE_THEORA_SUPPORT_TRUE = @HAVE_THEORA_SUPPORT_TRUE@ +HAVE_TIFF_SUPPORT_FALSE = @HAVE_TIFF_SUPPORT_FALSE@ +HAVE_TIFF_SUPPORT_TRUE = @HAVE_TIFF_SUPPORT_TRUE@ +HAVE_VORBIS_SUPPORT_FALSE = @HAVE_VORBIS_SUPPORT_FALSE@ +HAVE_VORBIS_SUPPORT_TRUE = @HAVE_VORBIS_SUPPORT_TRUE@ HAVE_X264_SUPPORT_FALSE = @HAVE_X264_SUPPORT_FALSE@ HAVE_X264_SUPPORT_TRUE = @HAVE_X264_SUPPORT_TRUE@ HAVE_XSLTPROC_PROG_FALSE = @HAVE_XSLTPROC_PROG_FALSE@ HAVE_XSLTPROC_PROG_TRUE = @HAVE_XSLTPROC_PROG_TRUE@ +HAVE_XVID_SUPPORT_FALSE = @HAVE_XVID_SUPPORT_FALSE@ +HAVE_XVID_SUPPORT_TRUE = @HAVE_XVID_SUPPORT_TRUE@ HTML_DIR = @HTML_DIR@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -148,14 +161,12 @@ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_ICONV = @INTLTOOL_ICONV@ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -167,21 +178,24 @@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -LAME_PROG = @LAME_PROG@ LDFLAGS = -lstdc++ \ - $(OGMRIP_LIBS) $(HAL_LIBS) $(HAL5_LIBS) \ - $(top_builddir)/libogmdvd/libogmdvd.la \ - $(top_builddir)/libogmdvd-gtk/libogmdvd-gtk.la \ - $(top_builddir)/libbacon/libbacon.a + $(top_builddir)/libogmdvd/libogmdvd.la \ + $(top_builddir)/libogmdvd-gtk/libogmdvd-gtk.la \ + $(top_builddir)/libbacon/libbacon.a \ + $(OGMRIP_LIBS) $(HAL_LIBS) LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ +LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBTIFF_LIBS = @LIBTIFF_LIBS@ LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -190,21 +204,15 @@ MAKEINFO = @MAKEINFO@ MENCODER_PROG = @MENCODER_PROG@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MKVMERGE_PROG = @MKVMERGE_PROG@ -MPLAYER_MAJOR_VERSION = @MPLAYER_MAJOR_VERSION@ -MPLAYER_MINOR_VERSION = @MPLAYER_MINOR_VERSION@ -MPLAYER_PRE_VERSION = @MPLAYER_PRE_VERSION@ MPLAYER_PROG = @MPLAYER_PROG@ -MPLAYER_RC_VERSION = @MPLAYER_RC_VERSION@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ -OCRAD_PROG = @OCRAD_PROG@ -OGGENC_PROG = @OGGENC_PROG@ OGMDVD_GTK_LT_VERSION = @OGMDVD_GTK_LT_VERSION@ OGMDVD_LT_VERSION = @OGMDVD_LT_VERSION@ OGMJOB_LT_VERSION = @OGMJOB_LT_VERSION@ -OGMMERGE_PROG = @OGMMERGE_PROG@ OGMRIP_CFLAGS = @OGMRIP_CFLAGS@ OGMRIP_GTK_LT_VERSION = @OGMRIP_GTK_LT_VERSION@ OGMRIP_LIBS = @OGMRIP_LIBS@ @@ -213,7 +221,6 @@ OGMRIP_MICRO_VERSION = @OGMRIP_MICRO_VERSION@ OGMRIP_MINOR_VERSION = @OGMRIP_MINOR_VERSION@ OGMRIP_VERSION = @OGMRIP_VERSION@ -OGMSPLIT_PROG = @OGMSPLIT_PROG@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -292,10 +299,10 @@ HFILE_GLOB = $(top_srcdir)/libogmdvd-gtk/*.h CFILE_GLOB = $(top_srcdir)/libogmdvd-gtk/*.c IGNORE_HFILES = ogmdvd-gtk.h -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) # We set GPATH here; this gives us semantics for GNU make # which are more like other make's VPATH, when it comes to @@ -321,7 +328,12 @@ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals -CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS) +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) all: all-am .SUFFIXES: @@ -437,7 +449,8 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic distclean-libtool \ + distclean-local dvi: dvi-am @@ -480,9 +493,9 @@ .PHONY: all all-am all-local check check-am clean clean-generic \ clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-local install-exec \ + distclean-generic distclean-libtool distclean-local distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic \ @@ -527,6 +540,9 @@ tmpl.stamp: tmpl-build.stamp @true +tmpl/*.sgml: + @true + #### xml #### sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) @@ -544,11 +560,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Building HTML' @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html + rm -rf $(srcdir)/html mkdir $(srcdir)/html cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' + @echo 'gtk-doc: Fixing cross-references' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp @@ -558,11 +574,16 @@ rm -f *~ *.bak rm -rf .libs +distclean-local: + cd $(srcdir) && \ + rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + cd $(srcdir) && rm -rf xml html install-data-local: - installfiles=`echo $(srcdir)/html/*`; \ + -installfiles=`echo $(srcdir)/html/*`; \ if test "$$installfiles" = '$(srcdir)/html/*'; \ then echo '-- Nothing to install' ; \ else \ @@ -573,6 +594,8 @@ done; \ echo '-- Installing $(srcdir)/html/index.sgml' ; \ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + which gtkdoc-rebase >/dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ fi uninstall-local: @@ -593,9 +616,10 @@ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/xml/*.xml $(distdir)/xml cp $(srcdir)/html/* $(distdir)/html - if test -f $(srcdir)/$(DOC_MODULE).types; then \ - cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \ - fi + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/xml/ogmdvd-chapter-list.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/xml/ogmdvd-chapter-list.xml --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/xml/ogmdvd-chapter-list.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/xml/ogmdvd-chapter-list.xml 2008-09-28 19:28:14.000000000 +0200 @@ -4,7 +4,7 @@ -OGMDvdChapterList +OGMDvdChapterList 3 OGMDVD-GTK Library @@ -15,14 +15,13 @@ - + Synopsis #include <ogmdvd-chapter-list.h> - OGMDvdChapterList; GtkWidget* ogmdvd_chapter_list_new (void); void ogmdvd_chapter_list_clear (OGMDvdChapterList *list); @@ -34,14 +33,12 @@ const gchar *label); gchar* ogmdvd_chapter_list_get_label (OGMDvdChapterList *list, guint chapter); - - + Object Hierarchy - GObject +----GInitiallyUnowned +----GtkObject @@ -55,7 +52,7 @@ - + Implemented Interfaces OGMDvdChapterList implements @@ -64,17 +61,16 @@ - + Properties - "title" gpointer : Read / Write - + Description @@ -83,17 +79,17 @@ - + Details - -<anchor id="OGMDvdChapterList-struct" role="struct"/>OGMDvdChapterList -OGMDvdChapterListtypedef struct _OGMDvdChapterList OGMDvdChapterList; + +OGMDvdChapterList +OGMDvdChapterListtypedef struct _OGMDvdChapterList OGMDvdChapterList; - -<anchor id="ogmdvd-chapter-list-new" role="function"/>ogmdvd_chapter_list_new () -ogmdvd_chapter_list_newGtkWidget* ogmdvd_chapter_list_new (void); + +ogmdvd_chapter_list_new () +ogmdvd_chapter_list_newGtkWidget* ogmdvd_chapter_list_new (void); Creates a new empty OGMDvdChapterList. @@ -102,9 +98,9 @@ Returns : The new OGMDvdChapterList - -<anchor id="ogmdvd-chapter-list-clear" role="function"/>ogmdvd_chapter_list_clear () -ogmdvd_chapter_list_clearvoid ogmdvd_chapter_list_clear (OGMDvdChapterList *list); + +ogmdvd_chapter_list_clear () +ogmdvd_chapter_list_clearvoid ogmdvd_chapter_list_clear (OGMDvdChapterList *list); Removes all entries of the OGMDvdChapterList. @@ -114,9 +110,9 @@ An OGMDvdChapterList - -<anchor id="ogmdvd-chapter-list-set-title" role="function"/>ogmdvd_chapter_list_set_title () -ogmdvd_chapter_list_set_titlevoid ogmdvd_chapter_list_set_title (OGMDvdChapterList *list, + +ogmdvd_chapter_list_set_title () +ogmdvd_chapter_list_set_titlevoid ogmdvd_chapter_list_set_title (OGMDvdChapterList *list, OGMDvdTitle *title); Adds to the list the chapters of the given OGMDvdTitle. @@ -130,9 +126,9 @@ An OGMDvdTitle - -<anchor id="ogmdvd-chapter-list-get-title" role="function"/>ogmdvd_chapter_list_get_title () -ogmdvd_chapter_list_get_titleOGMDvdTitle* ogmdvd_chapter_list_get_title (OGMDvdChapterList *list); + +ogmdvd_chapter_list_get_title () +ogmdvd_chapter_list_get_titleOGMDvdTitle* ogmdvd_chapter_list_get_title (OGMDvdChapterList *list); Returns the OGMDvdTitle which was passed to ogmdvd_chapter_list_set_title(). @@ -144,9 +140,9 @@ Returns : An OGMDvdTitle - -<anchor id="ogmdvd-chapter-list-set-label" role="function"/>ogmdvd_chapter_list_set_label () -ogmdvd_chapter_list_set_labelvoid ogmdvd_chapter_list_set_label (OGMDvdChapterList *list, + +ogmdvd_chapter_list_set_label () +ogmdvd_chapter_list_set_labelvoid ogmdvd_chapter_list_set_label (OGMDvdChapterList *list, guint chapter, const gchar *label); @@ -164,9 +160,9 @@ The label of the chapter - -<anchor id="ogmdvd-chapter-list-get-label" role="function"/>ogmdvd_chapter_list_get_label () -ogmdvd_chapter_list_get_labelgchar* ogmdvd_chapter_list_get_label (OGMDvdChapterList *list, + +ogmdvd_chapter_list_get_label () +ogmdvd_chapter_list_get_labelgchar* ogmdvd_chapter_list_get_label (OGMDvdChapterList *list, guint chapter); Returns the label of the given chapter. @@ -184,10 +180,10 @@ - + Property Details -<anchor id="OGMDvdChapterList--title"/>The "<literal>title</literal>" property -OGMDvdChapterList:title "title" gpointer : Read / Write +The <literal>"title"</literal> property +OGMDvdChapterList:title "title" gpointer : Read / Write The DVD title. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/xml/ogmdvd-drive-chooser-dialog.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/xml/ogmdvd-drive-chooser-dialog.xml --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/xml/ogmdvd-drive-chooser-dialog.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/xml/ogmdvd-drive-chooser-dialog.xml 2008-09-28 19:28:14.000000000 +0200 @@ -4,7 +4,7 @@ -OGMDvdDriveChooserDialog +OGMDvdDriveChooserDialog 3 OGMDVD-GTK Library @@ -15,24 +15,21 @@ - + Synopsis #include <ogmdvd-drive-chooser-dialog.h> - OGMDvdDriveChooserDialog; GtkWidget* ogmdvd_drive_chooser_dialog_new (void); - - + Object Hierarchy - GObject +----GInitiallyUnowned +----GtkObject @@ -48,7 +45,7 @@ - + Implemented Interfaces OGMDvdDriveChooserDialog implements @@ -58,16 +55,15 @@ - + Signals - "eject" : Run Last / No Recursion / No Hooks - + Description @@ -76,17 +72,17 @@ - + Details - -<anchor id="OGMDvdDriveChooserDialog-struct" role="struct"/>OGMDvdDriveChooserDialog -OGMDvdDriveChooserDialogtypedef struct _OGMDvdDriveChooserDialog OGMDvdDriveChooserDialog; + +OGMDvdDriveChooserDialog +OGMDvdDriveChooserDialogtypedef struct _OGMDvdDriveChooserDialog OGMDvdDriveChooserDialog; - -<anchor id="ogmdvd-drive-chooser-dialog-new" role="function"/>ogmdvd_drive_chooser_dialog_new () -ogmdvd_drive_chooser_dialog_newGtkWidget* ogmdvd_drive_chooser_dialog_new (void); + +ogmdvd_drive_chooser_dialog_new () +ogmdvd_drive_chooser_dialog_newGtkWidget* ogmdvd_drive_chooser_dialog_new (void); Creates a new OGMDvdDriveChooserDialog. @@ -98,10 +94,10 @@ - + Signal Details -<anchor id="OGMDvdDriveChooserDialog-eject"/>The "eject" signal -OGMDvdDriveChooserDialog::ejectvoid user_function (OGMDvdDriveChooserDialog *dialog, +The <literal>"eject"</literal> signal +OGMDvdDriveChooserDialog::ejectvoid user_function (OGMDvdDriveChooserDialog *dialog, gpointer user_data) : Run Last / No Recursion / No Hooks Emitted each time the eject button is clicked. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/xml/ogmdvd-drive-chooser-widget.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/xml/ogmdvd-drive-chooser-widget.xml --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/xml/ogmdvd-drive-chooser-widget.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/xml/ogmdvd-drive-chooser-widget.xml 2008-09-28 19:28:14.000000000 +0200 @@ -4,7 +4,7 @@ -OGMDvdDriveChooserWidget +OGMDvdDriveChooserWidget 3 OGMDVD-GTK Library @@ -15,24 +15,21 @@ - + Synopsis #include <ogmdvd-drive-chooser-widget.h> - OGMDvdDriveChooserWidget; GtkWidget* ogmdvd_drive_chooser_widget_new (void); - - + Object Hierarchy - GObject +----GInitiallyUnowned +----GtkObject @@ -47,7 +44,7 @@ - + Implemented Interfaces OGMDvdDriveChooserWidget implements @@ -59,7 +56,7 @@ - + Description @@ -68,17 +65,17 @@ - + Details - -<anchor id="OGMDvdDriveChooserWidget-struct" role="struct"/>OGMDvdDriveChooserWidget -OGMDvdDriveChooserWidgettypedef struct _OGMDvdDriveChooserWidget OGMDvdDriveChooserWidget; + +OGMDvdDriveChooserWidget +OGMDvdDriveChooserWidgettypedef struct _OGMDvdDriveChooserWidget OGMDvdDriveChooserWidget; - -<anchor id="ogmdvd-drive-chooser-widget-new" role="function"/>ogmdvd_drive_chooser_widget_new () -ogmdvd_drive_chooser_widget_newGtkWidget* ogmdvd_drive_chooser_widget_new (void); + +ogmdvd_drive_chooser_widget_new () +ogmdvd_drive_chooser_widget_newGtkWidget* ogmdvd_drive_chooser_widget_new (void); Creates a new OGMDvdDriveChooserWidget. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/xml/ogmdvd-drive-chooser.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/xml/ogmdvd-drive-chooser.xml --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/xml/ogmdvd-drive-chooser.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/xml/ogmdvd-drive-chooser.xml 2008-09-28 19:28:14.000000000 +0200 @@ -4,7 +4,7 @@ -OGMDvdDriveChooser +OGMDvdDriveChooser 3 OGMDVD-GTK Library @@ -16,31 +16,28 @@ - + Synopsis #include <ogmdvd-drive-chooser.h> - OGMDvdDriveChooser; NautilusBurnDrive* ogmdvd_drive_chooser_get_drive (OGMDvdDriveChooser *chooser); - - + Object Hierarchy - GInterface +----OGMDvdDriveChooser - + Prerequisites OGMDvdDriveChooser requires @@ -50,7 +47,7 @@ - + Known Implementations OGMDvdDriveChooser is implemented by @@ -59,16 +56,15 @@ - + Signals - "device-changed" : Run Last / No Recursion / No Hooks - + Description @@ -77,17 +73,17 @@ - + Details - -<anchor id="OGMDvdDriveChooser-struct" role="struct"/>OGMDvdDriveChooser -OGMDvdDriveChoosertypedef struct _OGMDvdDriveChooser OGMDvdDriveChooser; + +OGMDvdDriveChooser +OGMDvdDriveChoosertypedef struct _OGMDvdDriveChooser OGMDvdDriveChooser; - -<anchor id="ogmdvd-drive-chooser-get-drive" role="function"/>ogmdvd_drive_chooser_get_drive () -ogmdvd_drive_chooser_get_driveNautilusBurnDrive* ogmdvd_drive_chooser_get_drive (OGMDvdDriveChooser *chooser); + +ogmdvd_drive_chooser_get_drive () +ogmdvd_drive_chooser_get_driveNautilusBurnDrive* ogmdvd_drive_chooser_get_drive (OGMDvdDriveChooser *chooser); Returns the selected NautilusBurnDrive. @@ -102,10 +98,10 @@ - + Signal Details -<anchor id="OGMDvdDriveChooser-device-changed"/>The "device-changed" signal -OGMDvdDriveChooser::device-changedvoid user_function (OGMDvdDriveChooser *chooser, +The <literal>"device-changed"</literal> signal +OGMDvdDriveChooser::device-changedvoid user_function (OGMDvdDriveChooser *chooser, gchar *device, gpointer user_data) : Run Last / No Recursion / No Hooks diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/xml/ogmdvd-title-chooser-widget.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/xml/ogmdvd-title-chooser-widget.xml --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/xml/ogmdvd-title-chooser-widget.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/xml/ogmdvd-title-chooser-widget.xml 2008-09-28 19:28:14.000000000 +0200 @@ -4,7 +4,7 @@ -OGMDvdTitleChooserWidget +OGMDvdTitleChooserWidget 3 OGMDVD-GTK Library @@ -15,24 +15,21 @@ - + Synopsis #include <ogmdvd-title-chooser-widget.h> - OGMDvdTitleChooserWidget; GtkWidget* ogmdvd_title_chooser_widget_new (void); - - + Object Hierarchy - GObject +----GInitiallyUnowned +----GtkObject @@ -47,7 +44,7 @@ - + Implemented Interfaces OGMDvdTitleChooserWidget implements @@ -59,7 +56,7 @@ - + Description @@ -68,17 +65,17 @@ - + Details - -<anchor id="OGMDvdTitleChooserWidget-struct" role="struct"/>OGMDvdTitleChooserWidget -OGMDvdTitleChooserWidgettypedef struct _OGMDvdTitleChooserWidget OGMDvdTitleChooserWidget; + +OGMDvdTitleChooserWidget +OGMDvdTitleChooserWidgettypedef struct _OGMDvdTitleChooserWidget OGMDvdTitleChooserWidget; - -<anchor id="ogmdvd-title-chooser-widget-new" role="function"/>ogmdvd_title_chooser_widget_new () -ogmdvd_title_chooser_widget_newGtkWidget* ogmdvd_title_chooser_widget_new (void); + +ogmdvd_title_chooser_widget_new () +ogmdvd_title_chooser_widget_newGtkWidget* ogmdvd_title_chooser_widget_new (void); Creates a new OGMDvdTitleChooserWidget. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmdvd-gtk/xml/ogmdvd-title-chooser.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmdvd-gtk/xml/ogmdvd-title-chooser.xml --- ogmrip-0.11.1/docs/reference/ogmdvd-gtk/xml/ogmdvd-title-chooser.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmdvd-gtk/xml/ogmdvd-title-chooser.xml 2008-09-28 19:28:14.000000000 +0200 @@ -4,7 +4,7 @@ -OGMDvdTitleChooser +OGMDvdTitleChooser 3 OGMDVD-GTK Library @@ -15,34 +15,31 @@ - + Synopsis #include <ogmdvd-title-chooser.h> - OGMDvdTitleChooser; void ogmdvd_title_chooser_set_disc (OGMDvdTitleChooser *chooser, OGMDvdDisc *disc); OGMDvdDisc* ogmdvd_title_chooser_get_disc (OGMDvdTitleChooser *chooser); OGMDvdTitle* ogmdvd_title_chooser_get_active (OGMDvdTitleChooser *chooser); - - + Object Hierarchy - GInterface +----OGMDvdTitleChooser - + Prerequisites OGMDvdTitleChooser requires @@ -52,7 +49,7 @@ - + Known Implementations OGMDvdTitleChooser is implemented by @@ -60,10 +57,9 @@ - + Properties - "disc" gpointer : Read / Write "title" gpointer : Read @@ -71,7 +67,7 @@ - + Description @@ -80,17 +76,17 @@ - + Details - -<anchor id="OGMDvdTitleChooser-struct" role="struct"/>OGMDvdTitleChooser -OGMDvdTitleChoosertypedef struct _OGMDvdTitleChooser OGMDvdTitleChooser; + +OGMDvdTitleChooser +OGMDvdTitleChoosertypedef struct _OGMDvdTitleChooser OGMDvdTitleChooser; - -<anchor id="ogmdvd-title-chooser-set-disc" role="function"/>ogmdvd_title_chooser_set_disc () -ogmdvd_title_chooser_set_discvoid ogmdvd_title_chooser_set_disc (OGMDvdTitleChooser *chooser, + +ogmdvd_title_chooser_set_disc () +ogmdvd_title_chooser_set_discvoid ogmdvd_title_chooser_set_disc (OGMDvdTitleChooser *chooser, OGMDvdDisc *disc); Sets the OGMDvdDisc to select the title from. @@ -104,9 +100,9 @@ An OGMDvdDisc - -<anchor id="ogmdvd-title-chooser-get-disc" role="function"/>ogmdvd_title_chooser_get_disc () -ogmdvd_title_chooser_get_discOGMDvdDisc* ogmdvd_title_chooser_get_disc (OGMDvdTitleChooser *chooser); + +ogmdvd_title_chooser_get_disc () +ogmdvd_title_chooser_get_discOGMDvdDisc* ogmdvd_title_chooser_get_disc (OGMDvdTitleChooser *chooser); Returns the OGMDvdDisc which was passed to ogmdvd_title_chooser_set_disc(). @@ -118,9 +114,9 @@ Returns : The current OGMDvdDisc - -<anchor id="ogmdvd-title-chooser-get-active" role="function"/>ogmdvd_title_chooser_get_active () -ogmdvd_title_chooser_get_activeOGMDvdTitle* ogmdvd_title_chooser_get_active (OGMDvdTitleChooser *chooser); + +ogmdvd_title_chooser_get_active () +ogmdvd_title_chooser_get_activeOGMDvdTitle* ogmdvd_title_chooser_get_active (OGMDvdTitleChooser *chooser); Returns the active OGMDvdTitle. @@ -134,13 +130,13 @@ - + Property Details -<anchor id="OGMDvdTitleChooser--disc"/>The "<literal>disc</literal>" property -OGMDvdTitleChooser:disc "disc" gpointer : Read / Write +The <literal>"disc"</literal> property +OGMDvdTitleChooser:disc "disc" gpointer : Read / Write The DVD disc. -<anchor id="OGMDvdTitleChooser--title"/>The "<literal>title</literal>" property -OGMDvdTitleChooser:title "title" gpointer : Read +The <literal>"title"</literal> property +OGMDvdTitleChooser:title "title" gpointer : Read The active DVD title. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/abstract-classes.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/abstract-classes.html --- ogmrip-0.11.1/docs/reference/ogmjob/html/abstract-classes.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmjob/html/abstract-classes.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + Abstract Base Classes - + - + - + - - + + @@ -28,18 +28,21 @@ Abstract Base Classes
-OGMJobSpawn — Base class for all spawns +OGMJobSpawn — Base class for all spawns
-OGMJobContainer — Base class for spawns which contain other spawns +OGMJobContainer — Base class for spawns which contain other spawns
-OGMJobBin — Base class for spawns which contain one spawn only +OGMJobBin — Base class for spawns which contain one spawn only
-OGMJobList — Base class for spawns which contain multiple spawns +OGMJobList — Base class for spawns which contain multiple spawns
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/index.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/index.html --- ogmrip-0.11.1/docs/reference/ogmjob/html/index.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmjob/html/index.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,19 +1,20 @@ - + OGMJob Reference Manual - + - - + + - - + + -
+ +
@@ -24,38 +25,42 @@
I. Types and functions
-Logs — Support for logging the output of spawns +Logs — Support for logging the output of spawns
II. OGMJob Library Reference
Spawn Classes
-OGMJobExec — A spawn that runs a command line +OGMJobExec — A spawn that runs a command line
-OGMJobQueue — A container to run spawns in order +OGMJobQueue — A container to run spawns in order
-OGMJobPipeline — A container to run spawns together +OGMJobPipeline — A container to run spawns together
Abstract Base Classes
-OGMJobSpawn — Base class for all spawns +OGMJobSpawn — Base class for all spawns
-OGMJobContainer — Base class for spawns which contain other spawns +OGMJobContainer — Base class for spawns which contain other spawns
-OGMJobBin — Base class for spawns which contain one spawn only +OGMJobBin — Base class for spawns which contain one spawn only
-OGMJobList — Base class for spawns which contain multiple spawns +OGMJobList — Base class for spawns which contain multiple spawns
-
+
+
+
+ Generated by GTK-Doc V1.10
+ diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/index.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/index.sgml --- ogmrip-0.11.1/docs/reference/ogmjob/html/index.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmjob/html/index.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -1,4 +1,7 @@ + + + @@ -8,6 +11,10 @@ + + + + @@ -16,12 +23,25 @@ + + + + + + + + + + + + + @@ -32,22 +52,37 @@ + + + + + + + + + + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/ogmjob-api.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/ogmjob-api.html --- ogmrip-0.11.1/docs/reference/ogmjob/html/ogmjob-api.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmjob/html/ogmjob-api.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,36 +1,71 @@ - -Part II. OGMJob Library Reference - + +Part II. OGMJob Library Reference + - + - - + + - +

-Part II. OGMJob Library Reference

+Part II. OGMJob Library Reference

This section contains the API reference for OGMJob. All the public interfaces are documented here.

+
+

Table of Contents

+
+
Spawn Classes
+
+
+OGMJobExec — A spawn that runs a command line +
+
+OGMJobQueue — A container to run spawns in order +
+
+OGMJobPipeline — A container to run spawns together +
+
+
Abstract Base Classes
+
+
+OGMJobSpawn — Base class for all spawns +
+
+OGMJobContainer — Base class for spawns which contain other spawns +
+
+OGMJobBin — Base class for spawns which contain one spawn only +
+
+OGMJobList — Base class for spawns which contain multiple spawns +
+
+
+ +
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/OGMJobBin.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/OGMJobBin.html --- ogmrip-0.11.1/docs/reference/ogmjob/html/OGMJobBin.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmjob/html/OGMJobBin.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + OGMJobBin - + - + - - + + @@ -24,49 +24,44 @@ OGMJob Reference Manual Next -Top -  |  - Description -  |  - Object Hierarchy +Top +  |  + Description +  |  + Object Hierarchy
-

-OGMJobBin -

-

OGMJobBin — Base class for spawns which contain one spawn only

+

OGMJobBin

+

OGMJobBin — Base class for spawns which contain one spawn only
-

Synopsis

+

Synopsis

 
 #include <ogmjob-bin.h>
 
-
-                    OGMJobBin;
-OGMJobSpawn*        ogmjob_bin_get_child                (OGMJobBin *bin);
-
+                    OGMJobBin;
+OGMJobSpawn*        ogmjob_bin_get_child                (OGMJobBin *bin);
-

Object Hierarchy

+

Object Hierarchy

-
   GObject
-   +----OGMJobSpawn
-         +----OGMJobContainer
+   +----OGMJobSpawn
+         +----OGMJobContainer
                +----OGMJobBin
-

Description

+

Description

@@ -74,22 +69,20 @@

-

Details

+

Details

-

-OGMJobBin

-
typedef struct _OGMJobBin OGMJobBin;
+

OGMJobBin

+
typedef struct _OGMJobBin OGMJobBin;

-

-ogmjob_bin_get_child ()

-
OGMJobSpawn*        ogmjob_bin_get_child                (OGMJobBin *bin);
+

ogmjob_bin_get_child ()

+
OGMJobSpawn*        ogmjob_bin_get_child                (OGMJobBin *bin);

-Gets the child of the OGMJobBin, or NULL if the bin contains no child spawn.

+Gets the child of the OGMJobBin, or NULL if the bin contains no child spawn.

@@ -97,13 +90,13 @@ -bin : - An OGMJobBin +

bin :

+ An OGMJobBin -Returns : - An OGMJobSpawn +

Returns :

+ An OGMJobSpawn @@ -111,5 +104,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/OGMJobContainer.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/OGMJobContainer.html --- ogmrip-0.11.1/docs/reference/ogmjob/html/OGMJobContainer.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmjob/html/OGMJobContainer.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + OGMJobContainer - + - + - - + + @@ -24,72 +24,66 @@ OGMJob Reference Manual Next -Top -  |  - Description -  |  - Object Hierarchy -  |  - Signals +Top +  |  + Description +  |  + Object Hierarchy +  |  + Signals
-

-OGMJobContainer -

-

OGMJobContainer — Base class for spawns which contain other spawns

+

OGMJobContainer

+

OGMJobContainer — Base class for spawns which contain other spawns
-

Synopsis

+

Synopsis

 
 #include <ogmjob-container.h>
 
-
-void                (*OGMJobCallback)                   (OGMJobSpawn *spawn,
+void                (*OGMJobCallback)                   (OGMJobSpawn *spawn,
                                                          gpointer data);
-                    OGMJobContainer;
-void                ogmjob_container_add                (OGMJobContainer *container,
-                                                         OGMJobSpawn *spawn);
-void                ogmjob_container_remove             (OGMJobContainer *container,
-                                                         OGMJobSpawn *spawn);
-void                ogmjob_container_foreach            (OGMJobContainer *container,
-                                                         OGMJobCallback callback,
+                    OGMJobContainer;
+void                ogmjob_container_add                (OGMJobContainer *container,
+                                                         OGMJobSpawn *spawn);
+void                ogmjob_container_remove             (OGMJobContainer *container,
+                                                         OGMJobSpawn *spawn);
+void                ogmjob_container_foreach            (OGMJobContainer *container,
+                                                         OGMJobCallback callback,
                                                          gpointer data);
-
-

Object Hierarchy

+

Object Hierarchy

-
   GObject
-   +----OGMJobSpawn
+   +----OGMJobSpawn
          +----OGMJobContainer
-               +----OGMJobBin
-               +----OGMJobList
+               +----OGMJobBin
+               +----OGMJobList
-

Signals

+

Signals

-
-  "add"                                            : Run Last / No Recursion / No Hooks
-  "remove"                                         : Run Last / No Recursion / No Hooks
+  "add"                                            : Run Last / No Recursion / No Hooks
+  "remove"                                         : Run Last / No Recursion / No Hooks
-

Description

+

Description

@@ -97,16 +91,15 @@

-

Details

+

Details

-

-OGMJobCallback ()

-
void                (*OGMJobCallback)                   (OGMJobSpawn *spawn,
+
OGMJobCallback ()

+
void                (*OGMJobCallback)                   (OGMJobSpawn *spawn,
                                                          gpointer data);

 

-Specifies the type of functions passed to ogmjob_container_foreach().

+Specifies the type of functions passed to ogmjob_container_foreach().

 

 
 

@@ -114,12 +107,12 @@
 
 
 
-spawn :
- An OGMJobSpawn
+
spawn :

+ An OGMJobSpawn
 
 
 
-data :
+
data :

  The user data
 
 
@@ -128,19 +121,17 @@
-

-OGMJobContainer

-
typedef struct _OGMJobContainer OGMJobContainer;
+

OGMJobContainer

+
typedef struct _OGMJobContainer OGMJobContainer;

-

-ogmjob_container_add ()

-
void                ogmjob_container_add                (OGMJobContainer *container,
-                                                         OGMJobSpawn *spawn);
+

ogmjob_container_add ()

+
void                ogmjob_container_add                (OGMJobContainer *container,
+                                                         OGMJobSpawn *spawn);

Adds spawn to container.

@@ -150,13 +141,13 @@ -container : - An OGMJobContainer +

container :

+ An OGMJobContainer -spawn : - An OGMJobSpawn +

spawn :

+ An OGMJobSpawn @@ -164,10 +155,9 @@
-

-ogmjob_container_remove ()

-
void                ogmjob_container_remove             (OGMJobContainer *container,
-                                                         OGMJobSpawn *spawn);
+

ogmjob_container_remove ()

+
void                ogmjob_container_remove             (OGMJobContainer *container,
+                                                         OGMJobSpawn *spawn);

Removes spawn from container.

@@ -177,13 +167,13 @@ -container : - An OGMJobContainer +

container :

+ An OGMJobContainer -spawn : - An OGMJobSpawn +

spawn :

+ An OGMJobSpawn @@ -191,10 +181,9 @@
-

-ogmjob_container_foreach ()

-
void                ogmjob_container_foreach            (OGMJobContainer *container,
-                                                         OGMJobCallback callback,
+
ogmjob_container_foreach ()

+
void                ogmjob_container_foreach            (OGMJobContainer *container,
+                                                         OGMJobCallback callback,
                                                          gpointer data);

@@ -207,17 +196,17 @@
 
 
 
-container :
- An OGMJobContainer
+
container :

+ An OGMJobContainer
 
 
 
-callback :
+
callback :

  A callback
 
 
 
-data :
+
data :

  Callback user data
 
 
@@ -226,12 +215,11 @@
-

Signal Details

+

Signal Details

-

-The "add" signal

-
void                user_function                      (OGMJobContainer *container,
-                                                        OGMJobSpawn     *child,
+
The "add" signal

+
void                user_function                      (OGMJobContainer *container,
+                                                        OGMJobSpawn     *child,
                                                         gpointer         user_data)      : Run Last / No Recursion / No Hooks

@@ -244,17 +232,17 @@
 
 
 
-container :
+
container :

  the container that received the signal
 
 
 
-child :
+
child :

  the child to be added
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -262,10 +250,9 @@
-

-The "remove" signal

-
void                user_function                      (OGMJobContainer *container,
-                                                        OGMJobSpawn     *child,
+
The "remove" signal

+
void                user_function                      (OGMJobContainer *container,
+                                                        OGMJobSpawn     *child,
                                                         gpointer         user_data)      : Run Last / No Recursion / No Hooks

@@ -278,17 +265,17 @@
 
 
 
-container :
+
container :

  the container that received the signal
 
 
 
-child :
+
child :

  the child to be removed
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -296,5 +283,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/OGMJobExec.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/OGMJobExec.html --- ogmrip-0.11.1/docs/reference/ogmjob/html/OGMJobExec.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmjob/html/OGMJobExec.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + OGMJobExec - + - + - - + + @@ -24,56 +24,53 @@ OGMJob Reference Manual Next -Top -  |  - Description -  |  - Object Hierarchy +Top +  |  + Description +  |  + Object Hierarchy
-

-OGMJobExec -

-

OGMJobExec — A spawn that runs a command line

+

OGMJobExec

+

OGMJobExec — A spawn that runs a command line
-

Synopsis

+

Synopsis

 
 #include <ogmjob-exec.h>
 
-
 gdouble             (*OGMJobWatch)                      (OGMJobExec *exec,
+>gdouble             (*OGMJobWatch)                      (OGMJobExec *exec,
                                                          const gchar *buffer,
                                                          gpointer data);
-                    OGMJobExec;
-OGMJobSpawn*        ogmjob_exec_new                     (const OGMJobExec;
+OGMJobSpawn*        ogmjob_exec_new                     (const gchar *command_line);
-OGMJobSpawn*        ogmjob_exec_newv                    (OGMJobSpawn*        ogmjob_exec_newv                    (gchar **argv);
 gint                ogmjob_exec_get_status              (OGMJobExec *exec);
-void                ogmjob_exec_add_watch               (OGMJobExec *exec,
-                                                         OGMJobWatch watch_func,
+>gint                ogmjob_exec_get_status              (OGMJobExec *exec);
+void                ogmjob_exec_add_watch               (OGMJobExec *exec,
+                                                         OGMJobWatch watch_func,
                                                          gpointer watch_data);
-void                ogmjob_exec_add_watch_full          (OGMJobExec *exec,
-                                                         OGMJobWatch watch_func,
+void                ogmjob_exec_add_watch_full          (OGMJobExec *exec,
+                                                         OGMJobWatch watch_func,
                                                          gpointer watch_data,
@@ -86,22 +83,20 @@
                                                          gboolean swapped);
-
-

Object Hierarchy

+

Object Hierarchy

-
   GObject
-   +----OGMJobSpawn
+   +----OGMJobSpawn
          +----OGMJobExec
-

Description

+

Description

@@ -109,13 +104,12 @@

-

Details

+

Details

-

-OGMJobWatch ()

-
OGMJobWatch ()

+
gdouble             (*OGMJobWatch)                      (OGMJobExec *exec,
+>gdouble             (*OGMJobWatch)                      (OGMJobExec *exec,
                                                          const gchar *buffer,
@@ -123,8 +117,8 @@
 href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
 >gpointer data);

 

-Specifies the type of functions passed to ogmjob_exec_add_watch(), and
-ogmjob_exec_add_watch_full().

+Specifies the type of functions passed to ogmjob_exec_add_watch(), and
+ogmjob_exec_add_watch_full().

 

 
 

@@ -132,22 +126,22 @@
 
 
 
-exec :
- An OGMJobExec
+
exec :

+ An OGMJobExec
 
 
 
-buffer :
+
buffer :

  The data read
 
 
 
-data :
+
data :

  The user data
 
 
 
-Returns :
+
Returns :

  The progress made, or -1
 
 
@@ -156,22 +150,20 @@
-

-OGMJobExec

-
typedef struct _OGMJobExec OGMJobExec;
+

OGMJobExec

+
typedef struct _OGMJobExec OGMJobExec;

-

-ogmjob_exec_new ()

-
OGMJobSpawn*        ogmjob_exec_new                     (const 
ogmjob_exec_new ()

+
OGMJobSpawn*        ogmjob_exec_new                     (const gchar *command_line);

 

-Creates a new OGMJobExec.

+Creates a new OGMJobExec.

 

 
 

@@ -179,13 +171,13 @@
 
 
 
-command_line :
+
command_line :

  A command line
 
 
 
-Returns :
- The new OGMJobExec
+
Returns :

+ The new OGMJobExec
 
 
 
@@ -193,13 +185,12 @@
-

-ogmjob_exec_newv ()

-
OGMJobSpawn*        ogmjob_exec_newv                    (
ogmjob_exec_newv ()

+
OGMJobSpawn*        ogmjob_exec_newv                    (gchar **argv);

 

-Creates a new OGMJobExec.

+Creates a new OGMJobExec.

 

 
 

@@ -207,13 +198,13 @@
 
 
 
-argv :
+
argv :

  An argument vector
 
 
 
-Returns :
- The new OGMJobExec
+
Returns :

+ The new OGMJobExec
 
 
 
@@ -221,11 +212,10 @@
-

-ogmjob_exec_get_status ()

-
ogmjob_exec_get_status ()

+
gint                ogmjob_exec_get_status              (OGMJobExec *exec);

+>gint                ogmjob_exec_get_status              (OGMJobExec *exec);

Returns the execution status.

@@ -235,12 +225,12 @@ -exec : - An OGMJobExec +

exec :

+ An OGMJobExec -Returns : +

Returns :

The execution status @@ -249,10 +239,9 @@
-

-ogmjob_exec_add_watch ()

-
void                ogmjob_exec_add_watch               (OGMJobExec *exec,
-                                                         OGMJobWatch watch_func,
+
ogmjob_exec_add_watch ()

+
void                ogmjob_exec_add_watch               (OGMJobExec *exec,
+                                                         OGMJobWatch watch_func,
                                                          gpointer watch_data);

@@ -265,17 +254,17 @@
 
 
 
-exec :
- An OGMJobExec
+
exec :

+ An OGMJobExec
 
 
 
-watch_func :
- An OGMJobWatch
+
watch_func :

+ An OGMJobWatch
 
 
 
-watch_data :
+
watch_data :

  User data
 
 
@@ -284,10 +273,9 @@
-

-ogmjob_exec_add_watch_full ()

-
void                ogmjob_exec_add_watch_full          (OGMJobExec *exec,
-                                                         OGMJobWatch watch_func,
+
ogmjob_exec_add_watch_full ()

+
void                ogmjob_exec_add_watch_full          (OGMJobExec *exec,
+                                                         OGMJobWatch watch_func,
                                                          gpointer watch_data,
@@ -309,32 +297,32 @@
 
 
 
-exec :
- An OGMJobExec
+
exec :

+ An OGMJobExec
 
 
 
-watch_func :
- An OGMJobWatch
+
watch_func :

+ An OGMJobWatch
 
 
 
-watch_data :
+
watch_data :

  User data
 
 
 
-watch_out :
+
watch_out :

  Whether to watch stdin
 
 
 
-watch_err :
+
watch_err :

  Whether to watch stdout
 
 
 
-swapped :
+
swapped :

  Whether to swap exec and watch_data when calling watch_func
 
 
@@ -343,5 +331,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/OGMJobList.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/OGMJobList.html --- ogmrip-0.11.1/docs/reference/ogmjob/html/OGMJobList.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmjob/html/OGMJobList.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,16 +1,16 @@ - + OGMJobList - + - + - - + + @@ -21,55 +21,50 @@ Up Home OGMJob Reference Manual -  +  -Top -  |  - Description -  |  - Object Hierarchy +Top +  |  + Description +  |  + Object Hierarchy
-

-OGMJobList -

-

OGMJobList — Base class for spawns which contain multiple spawns

+

OGMJobList

+

OGMJobList — Base class for spawns which contain multiple spawns
-

Synopsis

+

Synopsis

 
 #include <ogmjob-list.h>
 
-
-                    OGMJobList;
+                    OGMJobList;
 GList*              ogmjob_list_get_children            (OGMJobList *list);
-
+>GList*              ogmjob_list_get_children            (OGMJobList *list);
-

Object Hierarchy

+

Object Hierarchy

-
   GObject
-   +----OGMJobSpawn
-         +----OGMJobContainer
+   +----OGMJobSpawn
+         +----OGMJobContainer
                +----OGMJobList
-                     +----OGMJobPipeline
-                     +----OGMJobQueue
+                     +----OGMJobPipeline
+                     +----OGMJobQueue
-

Description

+

Description

@@ -77,22 +72,20 @@

-

Details

+

Details

-

-OGMJobList

-
typedef struct _OGMJobList OGMJobList;
+

OGMJobList

+
typedef struct _OGMJobList OGMJobList;

-

-ogmjob_list_get_children ()

-
ogmjob_list_get_children ()

+
GList*              ogmjob_list_get_children            (OGMJobList *list);

+>GList*              ogmjob_list_get_children            (OGMJobList *list);

Returns the list's children.

@@ -102,12 +95,12 @@ -list : - An OGMJobList +

list :

+ An OGMJobList -Returns : +

Returns :

A GList, or NULL @@ -118,5 +111,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/ogmjob-ogmjob-log.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/ogmjob-ogmjob-log.html --- ogmrip-0.11.1/docs/reference/ogmjob/html/ogmjob-ogmjob-log.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmjob/html/ogmjob-ogmjob-log.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + Logs - + - - - - + + + + - - + + @@ -24,31 +24,28 @@ OGMJob Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-Logs -

-

Logs — Support for logging the output of spawns

+

Logs

+

Logs — Support for logging the output of spawns
-

Synopsis

+

Synopsis

 
 #include <ogmjob-log.h>
 
-
 gboolean            ogmjob_log_open                     (const gboolean            ogmjob_log_open                     (const gchar *filename,
                                                          GError **error);
 gboolean            ogmjob_log_close                    (gboolean            ogmjob_log_close                    (GError **error);
-void                ogmjob_log_write                    (const ogmjob_log_write                    (const gchar *str);
-void                ogmjob_log_printf                   (const ogmjob_log_printf                   (const gchar *format,
                                                          ...);
-void                ogmjob_log_set_print_stdout         (ogmjob_log_set_print_stdout         (gboolean log_stdout);
 gboolean            ogmjob_log_get_print_stdout         (void);
-void                ogmjob_log_set_print_stderr         (gboolean            ogmjob_log_get_print_stdout         (void);
+void                ogmjob_log_set_print_stderr         (gboolean log_stderr);
 gboolean            ogmjob_log_get_print_stderr         (void);
+>gboolean            ogmjob_log_get_print_stderr         (void);
-

Description

+

Description

@@ -89,11 +86,10 @@

-

Details

+

Details

-

-ogmjob_log_open ()

-
ogmjob_log_open ()

+
gboolean            ogmjob_log_open                     (const 
 
 
-filename :
+
filename :

  A filename
 
 
 
-error :
+
error :

  Location to store the error occuring, or NULL to ignore errors.
 
 
 
-Returns :
+
Returns :

  TRUE, when no error
@@ -131,9 +127,8 @@
-

-ogmjob_log_close ()

-
ogmjob_log_close ()

+
gboolean            ogmjob_log_close                    (
 
 
-error :
+
error :

  Location to store the error occuring, or NULL to ignore errors.
 
 
 
-Returns :
+
Returns :

  TRUE, when no error
@@ -163,9 +158,8 @@
-

-ogmjob_log_write ()

-
void                ogmjob_log_write                    (const 
ogmjob_log_write ()

+
void                ogmjob_log_write                    (const gchar *str);

 

@@ -176,7 +170,7 @@
 

-
+
@@ -184,9 +178,8 @@
 

-

-ogmjob_log_printf ()

-
void                ogmjob_log_printf                   (const 
ogmjob_log_printf ()

+
void                ogmjob_log_printf                   (const gchar *format,
                                                          ...);

@@ -199,12 +192,12 @@
 

-
+
-
+
@@ -213,9 +206,8 @@
 

-

-ogmjob_log_set_print_stdout ()

-
void                ogmjob_log_set_print_stdout         (
ogmjob_log_set_print_stdout ()

+
void                ogmjob_log_set_print_stdout         (gboolean log_stdout);

 

@@ -226,7 +218,7 @@
 

 
 
str :
str :

  A string to log
 
 

 
 
 
 
format :
format :

  A message format
 
 

 
... :
... :

  The parameters of the format string
 
 

 
 

-
+
-
-
+
-
+
-
+
@@ -158,9 +150,8 @@
 

-

-ogmjob_spawn_cancel ()

-
void                ogmjob_spawn_cancel                 (OGMJobSpawn *spawn);

+
ogmjob_spawn_cancel ()

+
void                ogmjob_spawn_cancel                 (OGMJobSpawn *spawn);

 

 Cancels a spawn.

 

@@ -169,17 +160,16 @@
 

 
 
log_stdout :
log_stdout :

  TRUE to log on stdout
@@ -236,9 +228,8 @@
 
 

 

-

-ogmjob_log_get_print_stdout ()

-
ogmjob_log_get_print_stdout ()

+
gboolean            ogmjob_log_get_print_stdout         (void);

 

@@ -249,7 +240,7 @@
 

-
+
-
+

 
 
Returns :
Returns :

  TRUE if log on stdout
@@ -259,9 +250,8 @@
 
 

 

-

-ogmjob_log_set_print_stderr ()

-
void                ogmjob_log_set_print_stderr         (
ogmjob_log_set_print_stderr ()

+
void                ogmjob_log_set_print_stderr         (gboolean log_stderr);

 

@@ -272,7 +262,7 @@
 

-
+
-
+

 
 
log_stderr :
log_stderr :

  TRUE to log on stderr
@@ -282,9 +272,8 @@
 
 

 

-

-ogmjob_log_get_print_stderr ()

-
ogmjob_log_get_print_stderr ()

+
gboolean            ogmjob_log_get_print_stderr         (void);

 

@@ -295,7 +284,7 @@
 

-
+
-
+

 
 
Returns :
Returns :

  TRUE if log on stderr
@@ -305,5 +294,8 @@
 
 
 
+

+

+          Generated by GTK-Doc V1.10

 
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/OGMJobPipeline.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/OGMJobPipeline.html
--- ogmrip-0.11.1/docs/reference/ogmjob/html/OGMJobPipeline.html	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/html/OGMJobPipeline.html	2008-09-28 19:28:17.000000000 +0200
@@ -1,17 +1,17 @@
 
 
 
-
+
 OGMJobPipeline
-
+
 
 
 
 
-
+
 
-
-
+
+
 
 
 
@@ -24,50 +24,45 @@
 		OGMJob Reference Manual
 Next
 
Top
-                   | 
-                  Description
-                   | 
-                  Object Hierarchy
Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy

 

 

 

 

 
-

-OGMJobPipeline
-

-
OGMJobPipeline — A container to run spawns together

+
OGMJobPipeline

+
OGMJobPipeline — A container to run spawns together

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 #include <ogmjob-pipeline.h>
 
-
-                    OGMJobPipeline;
-OGMJobSpawn*        ogmjob_pipeline_new                 (void);
-
+                    OGMJobPipeline;
+OGMJobSpawn*        ogmjob_pipeline_new                 (void);
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
-
   GObject
-   +----OGMJobSpawn
-         +----OGMJobContainer
-               +----OGMJobList
+   +----OGMJobSpawn
+         +----OGMJobContainer
+               +----OGMJobList
                      +----OGMJobPipeline
 

 

 

-
Description

+
Description

 

 

 

@@ -75,35 +70,36 @@
 

 

 

-
Details

+
Details

 

-

-OGMJobPipeline

-
typedef struct _OGMJobPipeline OGMJobPipeline;

+
OGMJobPipeline

+
typedef struct _OGMJobPipeline OGMJobPipeline;

 

 
 

 

 

 

-

-ogmjob_pipeline_new ()

-
OGMJobSpawn*        ogmjob_pipeline_new                 (void);

+
ogmjob_pipeline_new ()

+
OGMJobSpawn*        ogmjob_pipeline_new                 (void);

 

-Creates a new OGMJobPipeline.

+Creates a new OGMJobPipeline.

 

 
 

 

-
-
+

 
 
Returns : The new OGMJobPipeline
+
Returns :
 The new OGMJobPipeline
 
 

 

 

 

 

+

+

+          Generated by GTK-Doc V1.10

 
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/OGMJobQueue.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/OGMJobQueue.html
--- ogmrip-0.11.1/docs/reference/ogmjob/html/OGMJobQueue.html	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/html/OGMJobQueue.html	2008-09-28 19:28:17.000000000 +0200
@@ -1,17 +1,17 @@
 
 
 
-
+
 OGMJobQueue
-
+
 
 
 
 
-
+
 
-
-
+
+
 
 
 
@@ -24,50 +24,45 @@
 
OGMJob Reference Manual
 Next
 
Top
-                   | 
-                  Description
-                   | 
-                  Object Hierarchy
Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy

 

 

 

 

 
-

-OGMJobQueue
-

-
OGMJobQueue — A container to run spawns in order

+
OGMJobQueue

+
OGMJobQueue — A container to run spawns in order

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 #include <ogmjob-queue.h>
 
-
-                    OGMJobQueue;
-OGMJobSpawn*        ogmjob_queue_new                    (void);
-
+                    OGMJobQueue;
+OGMJobSpawn*        ogmjob_queue_new                    (void);
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
-
   GObject
-   +----OGMJobSpawn
-         +----OGMJobContainer
-               +----OGMJobList
+   +----OGMJobSpawn
+         +----OGMJobContainer
+               +----OGMJobList
                      +----OGMJobQueue
 

 

 

-
Description

+
Description

 

 

 

@@ -75,35 +70,36 @@
 

 

 

-
Details

+
Details

 

-

-OGMJobQueue

-
typedef struct _OGMJobQueue OGMJobQueue;

+
OGMJobQueue

+
typedef struct _OGMJobQueue OGMJobQueue;

 

 
 

 

 

 

-

-ogmjob_queue_new ()

-
OGMJobSpawn*        ogmjob_queue_new                    (void);

+
ogmjob_queue_new ()

+
OGMJobSpawn*        ogmjob_queue_new                    (void);

 

-Creates a new OGMJobQueue.

+Creates a new OGMJobQueue.

 

 
 

 

-
-
+

 
 
Returns : The new OGMJobQueue
+
Returns :
 The new OGMJobQueue
 
 

 

 

 

 

+

+

+          Generated by GTK-Doc V1.10

 
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/ogmjob-ref.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/ogmjob-ref.html
--- ogmrip-0.11.1/docs/reference/ogmjob/html/ogmjob-ref.html	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/html/ogmjob-ref.html	2008-09-28 19:28:17.000000000 +0200
@@ -1,37 +1,46 @@
 
 
 
-
-Part I. Types and functions
-
+
+Part I. Types and functions
+
 
 
 
 
-
+
 
-
-
+
+
 
 
 
 
 
-
+
 

 

-Part I. Types and functions

+Part I. Types and functions

 

 

 
This section describes the enumerated types used throughout
         the documentation as well as some functions to log the output of
         the spawned processes.

+

+
Table of Contents

+

+Logs — Support for logging the output of spawns
+

 

 

+
+

+

+          Generated by GTK-Doc V1.10

 
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/OGMJobSpawn.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/OGMJobSpawn.html
--- ogmrip-0.11.1/docs/reference/ogmjob/html/OGMJobSpawn.html	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/html/OGMJobSpawn.html	2008-09-28 19:28:17.000000000 +0200
@@ -1,17 +1,17 @@
 
 
 
-
+
 OGMJobSpawn
-
+
 
 
 
 
-
+
 
-
-
+
+
 
 
 
@@ -24,84 +24,78 @@
 		OGMJob Reference Manual
 Next
 
Top
-                   | 
-                  Description
-                   | 
-                  Object Hierarchy
-                   | 
-                  Signals
Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Signals

 

 

 

 

 
-

-OGMJobSpawn
-

-
OGMJobSpawn — Base class for all spawns

+
OGMJobSpawn

+
OGMJobSpawn — Base class for all spawns

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 #include <ogmjob-spawn.h>
 
-
-                    OGMJobSpawn;
+                    OGMJobSpawn;
 gint                ogmjob_spawn_run                    (OGMJobSpawn *spawn,
+>gint                ogmjob_spawn_run                    (OGMJobSpawn *spawn,
                                                          GError **error);
-void                ogmjob_spawn_cancel                 (OGMJobSpawn *spawn);
-void                ogmjob_spawn_suspend                (OGMJobSpawn *spawn);
-void                ogmjob_spawn_resume                 (OGMJobSpawn *spawn);
-void                ogmjob_spawn_set_async              (OGMJobSpawn *spawn,
+void                ogmjob_spawn_cancel                 (OGMJobSpawn *spawn);
+void                ogmjob_spawn_suspend                (OGMJobSpawn *spawn);
+void                ogmjob_spawn_resume                 (OGMJobSpawn *spawn);
+void                ogmjob_spawn_set_async              (OGMJobSpawn *spawn,
                                                          gboolean async);
 gboolean            ogmjob_spawn_get_async              (OGMJobSpawn *spawn);
-OGMJobSpawn*        ogmjob_spawn_get_parent             (OGMJobSpawn *spawn);
-void                ogmjob_spawn_set_parent             (OGMJobSpawn *spawn,
-                                                         OGMJobSpawn *parent);
-void                ogmjob_spawn_propagate_error        (OGMJobSpawn *spawn,
+>gboolean            ogmjob_spawn_get_async              (OGMJobSpawn *spawn);
+OGMJobSpawn*        ogmjob_spawn_get_parent             (OGMJobSpawn *spawn);
+void                ogmjob_spawn_set_parent             (OGMJobSpawn *spawn,
+                                                         OGMJobSpawn *parent);
+void                ogmjob_spawn_propagate_error        (OGMJobSpawn *spawn,
                                                          GError *error);
-
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
-
   GObject
    +----OGMJobSpawn
-         +----OGMJobContainer
-         +----OGMJobExec
+         +----OGMJobContainer
+         +----OGMJobExec
 

 

 

-
Signals

+
Signals

 
-
-  "cancel"                                         : Run Last / No Recursion / No Hooks
-  "progress"                                       : Run Last / No Recursion / No Hooks
-  "resume"                                         : Run Last / No Recursion / No Hooks
-  "run"                                            : Run Last / No Recursion / No Hooks
-  "suspend"                                        : Run Last / No Recursion / No Hooks
+  "cancel"                                         : Run Last / No Recursion / No Hooks
+  "progress"                                       : Run Last / No Recursion / No Hooks
+  "resume"                                         : Run Last / No Recursion / No Hooks
+  "run"                                            : Run Last / No Recursion / No Hooks
+  "suspend"                                        : Run Last / No Recursion / No Hooks
 

 

 

-
Description

+
Description

 

 

 

@@ -109,22 +103,20 @@
 

 

 

-
Details

+
Details

 

-

-OGMJobSpawn

-
typedef struct _OGMJobSpawn OGMJobSpawn;

+
OGMJobSpawn

+
typedef struct _OGMJobSpawn OGMJobSpawn;

 

 
 

 

 

 

-

-ogmjob_spawn_run ()

-
ogmjob_spawn_run ()

+
gint                ogmjob_spawn_run                    (OGMJobSpawn *spawn,
+>gint                ogmjob_spawn_run                    (OGMJobSpawn *spawn,
                                                          GError **error);

@@ -137,19 +129,19 @@
 

 
 
spawn : An OGMJobSpawn
+
spawn :
 An OGMJobSpawn
 
 

 
error :
error :

  Location for error, or NULL
 
 

 
Returns :
Returns :

  An OGMJobResultType
 
 

 
 

-
-
+

 
 
spawn : An OGMJobSpawn
+
spawn :
 An OGMJobSpawn
-

-ogmjob_spawn_suspend ()

-
void                ogmjob_spawn_suspend                (OGMJobSpawn *spawn);
+

ogmjob_spawn_suspend ()

+
void                ogmjob_spawn_suspend                (OGMJobSpawn *spawn);

Suspends a spawn.

@@ -188,17 +178,16 @@

- - +
spawn : An OGMJobSpawn +

spawn :

 An OGMJobSpawn
-

-ogmjob_spawn_resume ()

-
void                ogmjob_spawn_resume                 (OGMJobSpawn *spawn);
+

ogmjob_spawn_resume ()

+
void                ogmjob_spawn_resume                 (OGMJobSpawn *spawn);

Resumes a suspended spawn.

@@ -207,36 +196,35 @@

- - +
spawn : An OGMJobSpawn +

spawn :

 An OGMJobSpawn
-

-ogmjob_spawn_set_async ()

-
void                ogmjob_spawn_set_async              (OGMJobSpawn *spawn,
+
ogmjob_spawn_set_async ()

+
void                ogmjob_spawn_set_async              (OGMJobSpawn *spawn,
                                                          gboolean async);

 

+Sets whether to run the spawn asynchronously.

+

 
 

 

-
-
+
-
-
+
@@ -244,11 +232,12 @@
 

-

-ogmjob_spawn_get_async ()

-
ogmjob_spawn_get_async ()

+
gboolean            ogmjob_spawn_get_async              (OGMJobSpawn *spawn);

+>gboolean            ogmjob_spawn_get_async              (OGMJobSpawn *spawn);

+

+Gets whether to run the spawn asynchronously.

 

 
 

@@ -256,15 +245,13 @@
 

-
-
+
-
-
+
@@ -272,9 +259,8 @@
 

-

-ogmjob_spawn_get_parent ()

-
OGMJobSpawn*        ogmjob_spawn_get_parent             (OGMJobSpawn *spawn);

+
ogmjob_spawn_get_parent ()

+
OGMJobSpawn*        ogmjob_spawn_get_parent             (OGMJobSpawn *spawn);

 

 Returns the parent container of a spawn.

 

@@ -284,13 +270,13 @@
 

-
-
+
-
-
+
@@ -298,10 +284,9 @@
 

-

-ogmjob_spawn_set_parent ()

-
void                ogmjob_spawn_set_parent             (OGMJobSpawn *spawn,
-                                                         OGMJobSpawn *parent);

+
ogmjob_spawn_set_parent ()

+
void                ogmjob_spawn_set_parent             (OGMJobSpawn *spawn,
+                                                         OGMJobSpawn *parent);

 

 Sets the container as the parent of a widget.

 

@@ -311,12 +296,12 @@
 

-
-
+
-
+
@@ -325,28 +310,29 @@
 

-

-ogmjob_spawn_propagate_error ()

-
void                ogmjob_spawn_propagate_error        (OGMJobSpawn *spawn,
+
ogmjob_spawn_propagate_error ()

+
void                ogmjob_spawn_propagate_error        (OGMJobSpawn *spawn,
                                                          GError *error);

 

+Propagates error in spawn.

+

 
 

 

 
 
 
spawn :
+
spawn :
 An OGMJobSpawn
 
 

 
async :
-
-
+
async :
 TRUE if asynchronous
 
 

 
 
 
 
 
spawn :
+
spawn :
 An OGMJobSpawn
 
 

 
Returns :
-
-
+
Returns :
 TRUE if asynchronous
 
 

 
 
 
 
 
spawn : An OGMJobSpawn
+
spawn :
 An OGMJobSpawn
 
 

 
Returns : An OGMJobSpawn, or NULL
+
Returns :
 An OGMJobSpawn, or NULL
 
 

 
 
 
 
 
spawn : An OGMJobSpawn
+
spawn :
 An OGMJobSpawn
 
 

 
parent :
parent :

  The parent container
 
 

 
 

-
-
+
-
-
+
@@ -354,16 +340,15 @@
 

-
Signal Details

+
Signal Details

 

-

-The "cancel" signal

-
void                user_function                      (OGMJobSpawn *container,
+
The "cancel" signal

+
void                user_function                      (OGMJobSpawn *spawn,
                                                         gpointer     user_data)      : Run Last / No Recursion / No Hooks

 

-Emitted each time a spawn has been canceled.

+Emitted each time a spawn is canceled.

 

 
 

@@ -371,12 +356,12 @@
 

-
+
-
+
@@ -384,9 +369,8 @@
 

-

-The "progress" signal

-
void                user_function                      (OGMJobSpawn *container,
+
The "progress" signal

+
void                user_function                      (OGMJobSpawn *spawn,
                                                         gdouble      fraction,
@@ -402,17 +386,17 @@
 

-
+
-
-
+
-
+
@@ -420,9 +404,8 @@
 

-

-The "resume" signal

-
void                user_function                      (OGMJobSpawn *container,
+
The "resume" signal

+
void                user_function                      (OGMJobSpawn *spawn,
                                                         gpointer     user_data)      : Run Last / No Recursion / No Hooks

@@ -435,12 +418,12 @@
 

-
+
-
+
@@ -448,11 +431,10 @@
 

-

-The "run" signal

-
The "run" signal

+
gint                user_function                      (OGMJobSpawn *spawn,
+>gint                user_function                      (OGMJobSpawn *spawn,
                                                         gpointer     user_data)      : Run Last / No Recursion / No Hooks

@@ -465,16 +447,16 @@
 

-
+
-
+
-
+
@@ -483,9 +465,8 @@
 

-

-The "suspend" signal

-
void                user_function                      (OGMJobSpawn *container,
+
The "suspend" signal

+
void                user_function                      (OGMJobSpawn *spawn,
                                                         gpointer     user_data)      : Run Last / No Recursion / No Hooks

@@ -498,12 +479,12 @@
 

-
+
-
+
@@ -511,5 +492,8 @@
 
+

+

+          Generated by GTK-Doc V1.10

diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/spawn-classes.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/spawn-classes.html
--- ogmrip-0.11.1/docs/reference/ogmjob/html/spawn-classes.html	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/html/spawn-classes.html	2008-09-28 19:28:17.000000000 +0200
@@ -1,17 +1,17 @@
 
-
+Spawn Classes
-
+
-
-
+
+
-
+
-
-
+
+
@@ -28,15 +28,18 @@
 Spawn Classes

 

-OGMJobExec — A spawn that runs a command line
+OGMJobExec — A spawn that runs a command line
 

 

-OGMJobQueue — A container to run spawns in order
+OGMJobQueue — A container to run spawns in order
 

 

-OGMJobPipeline — A container to run spawns together
+OGMJobPipeline — A container to run spawns together
 

 

+

+

+          Generated by GTK-Doc V1.10

diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/html/style.css /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/html/style.css
--- ogmrip-0.11.1/docs/reference/ogmjob/html/style.css	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/html/style.css	2008-09-28 19:28:17.000000000 +0200
@@ -1,16 +1,16 @@
-.synopsis, .classsynopsis 
+.synopsis, .classsynopsis
 {
   background: #eeeeee;
   border: solid 1px #aaaaaa;
   padding: 0.5em;
 }
-.programlisting 
+.programlisting
 {
   background: #eeeeff;
   border: solid 1px #aaaaff;
   padding: 0.5em;
 }
-.variablelist 
+.variablelist
 {
   padding: 4px;
   margin-left: 3em;
@@ -19,62 +19,93 @@
 {
   vertical-align: top;
 }
+
 /* this is needed so that the local anchors are displayed below the naviagtion */
-div.refnamediv a[name], div.refsect1 a[name]
-{
-  position: relative;
-  top: -4.5em;
-}
-table.navigation#top
-{
-  background: #ffeeee;
-  border: solid 1px #ffaaaa;
-  margin-top: 0;
-  margin-bottom: 0;
-  position: fixed;
-  top: 0;
-  left: 0;
-  height: 2em;
-  z-index: 1;
+@media screen {
+  sup a.footnote
+  {
+    position: relative;
+    top: 0em ! important;
+  }
+  div.refnamediv a[name], div.refsect1 a[name]
+  {
+    position: relative;
+    top: -4.5em;
+  }
+  table.navigation#top
+  {
+    background: #ffeeee;
+    border: solid 1px #ffaaaa;
+    margin-top: 0;
+    margin-bottom: 0;
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: 2em;
+    z-index: 1;
+  }
+  .navigation a
+  {
+    color: #770000;
+  }
+  .navigation a:visited
+  {
+    color: #550000;
+  }
+  td.shortcuts
+  {
+    color: #770000;
+    font-size: 80%;
+  }
+  div.refentry, div.chapter, div.reference, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface
+  {
+    position: relative;
+    top: 3em;
+    z-index: 0;
+  }
+  div.refnamediv
+  {
+    margin-top: 2em;
+  }
+  body
+  {
+    padding-bottom: 20em;
+  }
+}
+@media print {
+  table.navigation {
+    visibility: collapse;
+    display: none;
+  }
+  div.titlepage table.navigation {
+    visibility: visible;
+    display: table;
+    background: #ffeeee;
+    border: solid 1px #ffaaaa;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    height: 2em;
+  }
 }
-.navigation a 
-{
-  color: #770000;
-}
-.navigation a:visited 
-{
-  color: #550000;
-}
-.navigation .title 
+
+.navigation .title
 {
   font-size: 200%;
 }
-td.shortcuts
-{
-  color: #770000;
-  font-size: 80%;
-}
 
-div.refentry, div.chapter, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface
-{
-  position: relative;
-  top: 3em;
-  z-index: 0;
-}
-div.refnamediv 
-{
-  margin-top: 2em;
-}
-div.gallery-float 
+
+div.gallery-float
 {
   float: left;
   padding: 10px;
 }
-div.gallery-float img 
+div.gallery-float img
 {
   border-style: none;
 }
-div.gallery-spacer 
+div.gallery-spacer
 {
   clear: both;
 }
@@ -110,3 +141,20 @@
 {
   background-color: #eeeeee;
 }
+
+hr
+{
+  color: #777777;
+  background: #777777;
+  border: 0;
+  height: 1px;
+  clear: both;
+}
+
+.footer
+{
+  padding-top: 3.5em;
+  color: #777777;
+  text-align: center;
+  font-size: 80%;
+}
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/Makefile.am /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/Makefile.am
--- ogmrip-0.11.1/docs/reference/ogmjob/Makefile.am	2007-10-07 21:03:53.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/Makefile.am	2008-07-15 23:45:43.000000000 +0200
@@ -14,9 +14,9 @@
 include $(top_srcdir)/gtk-doc.make
 
 CFLAGS = \
-	$(OGMRIP_CFLAGS) \
+  $(OGMRIP_CFLAGS) \
   -I$(top_srcdir)/libogmjob
 
 LDFLAGS = \
-	$(OGMRIP_LIBS) \
-	$(top_builddir)/libogmjob/libogmjob.la
+  $(OGMRIP_LIBS) \
+  $(top_builddir)/libogmjob/libogmjob.la
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/Makefile.in /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/Makefile.in
--- ogmrip-0.11.1/docs/reference/ogmjob/Makefile.in	2007-10-21 21:05:55.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/Makefile.in	2008-09-21 14:16:34.000000000 +0200
@@ -45,8 +45,7 @@
 	$(top_srcdir)/gtk-doc.make
 subdir = docs/reference/ogmjob
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -70,7 +69,7 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = \
-	$(OGMRIP_CFLAGS) \
+  $(OGMRIP_CFLAGS) \
   -I$(top_srcdir)/libogmjob
 
 CPP = @CPP@
@@ -83,6 +82,7 @@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 DVDREAD_LIBS = @DVDREAD_LIBS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
@@ -96,7 +96,6 @@
 ENCHANT_LIBS = @ENCHANT_LIBS@
 EXEEXT = @EXEEXT@
 F77 = @F77@
-FAAC_PROG = @FAAC_PROG@
 FFLAGS = @FFLAGS@
 GCONFTOOL = @GCONFTOOL@
 GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
@@ -107,8 +106,8 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GOCR_PROG = @GOCR_PROG@
 GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
 GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
 GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
 GUI_CFLAGS = @GUI_CFLAGS@
@@ -117,24 +116,38 @@
 HAL_LIBS = @HAL_LIBS@
 HAVE_AAC_SUPPORT_FALSE = @HAVE_AAC_SUPPORT_FALSE@
 HAVE_AAC_SUPPORT_TRUE = @HAVE_AAC_SUPPORT_TRUE@
-HAVE_DTS_SUPPORT_FALSE = @HAVE_DTS_SUPPORT_FALSE@
-HAVE_DTS_SUPPORT_TRUE = @HAVE_DTS_SUPPORT_TRUE@
 HAVE_ENCHANT_SUPPORT_FALSE = @HAVE_ENCHANT_SUPPORT_FALSE@
 HAVE_ENCHANT_SUPPORT_TRUE = @HAVE_ENCHANT_SUPPORT_TRUE@
 HAVE_GTK_SUPPORT_FALSE = @HAVE_GTK_SUPPORT_FALSE@
 HAVE_GTK_SUPPORT_TRUE = @HAVE_GTK_SUPPORT_TRUE@
+HAVE_LAVC_SUPPORT_FALSE = @HAVE_LAVC_SUPPORT_FALSE@
+HAVE_LAVC_SUPPORT_TRUE = @HAVE_LAVC_SUPPORT_TRUE@
 HAVE_LAVF_SUPPORT_FALSE = @HAVE_LAVF_SUPPORT_FALSE@
 HAVE_LAVF_SUPPORT_TRUE = @HAVE_LAVF_SUPPORT_TRUE@
 HAVE_MKV_SUPPORT_FALSE = @HAVE_MKV_SUPPORT_FALSE@
 HAVE_MKV_SUPPORT_TRUE = @HAVE_MKV_SUPPORT_TRUE@
+HAVE_MP3_SUPPORT_FALSE = @HAVE_MP3_SUPPORT_FALSE@
+HAVE_MP3_SUPPORT_TRUE = @HAVE_MP3_SUPPORT_TRUE@
+HAVE_MP4_SUPPORT_FALSE = @HAVE_MP4_SUPPORT_FALSE@
+HAVE_MP4_SUPPORT_TRUE = @HAVE_MP4_SUPPORT_TRUE@
+HAVE_OGM_SUPPORT_FALSE = @HAVE_OGM_SUPPORT_FALSE@
+HAVE_OGM_SUPPORT_TRUE = @HAVE_OGM_SUPPORT_TRUE@
+HAVE_PNG_SUPPORT_FALSE = @HAVE_PNG_SUPPORT_FALSE@
+HAVE_PNG_SUPPORT_TRUE = @HAVE_PNG_SUPPORT_TRUE@
 HAVE_SRT_SUPPORT_FALSE = @HAVE_SRT_SUPPORT_FALSE@
 HAVE_SRT_SUPPORT_TRUE = @HAVE_SRT_SUPPORT_TRUE@
 HAVE_THEORA_SUPPORT_FALSE = @HAVE_THEORA_SUPPORT_FALSE@
 HAVE_THEORA_SUPPORT_TRUE = @HAVE_THEORA_SUPPORT_TRUE@
+HAVE_TIFF_SUPPORT_FALSE = @HAVE_TIFF_SUPPORT_FALSE@
+HAVE_TIFF_SUPPORT_TRUE = @HAVE_TIFF_SUPPORT_TRUE@
+HAVE_VORBIS_SUPPORT_FALSE = @HAVE_VORBIS_SUPPORT_FALSE@
+HAVE_VORBIS_SUPPORT_TRUE = @HAVE_VORBIS_SUPPORT_TRUE@
 HAVE_X264_SUPPORT_FALSE = @HAVE_X264_SUPPORT_FALSE@
 HAVE_X264_SUPPORT_TRUE = @HAVE_X264_SUPPORT_TRUE@
 HAVE_XSLTPROC_PROG_FALSE = @HAVE_XSLTPROC_PROG_FALSE@
 HAVE_XSLTPROC_PROG_TRUE = @HAVE_XSLTPROC_PROG_TRUE@
+HAVE_XVID_SUPPORT_FALSE = @HAVE_XVID_SUPPORT_FALSE@
+HAVE_XVID_SUPPORT_TRUE = @HAVE_XVID_SUPPORT_TRUE@
 HTML_DIR = @HTML_DIR@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -146,14 +159,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -165,19 +176,22 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-LAME_PROG = @LAME_PROG@
 LDFLAGS = \
-	$(OGMRIP_LIBS) \
-	$(top_builddir)/libogmjob/libogmjob.la
+  $(OGMRIP_LIBS) \
+  $(top_builddir)/libogmjob/libogmjob.la
 
 LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
 LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
+LIBPNG_LIBS = @LIBPNG_LIBS@
 LIBS = @LIBS@
+LIBTIFF_LIBS = @LIBTIFF_LIBS@
 LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -186,21 +200,15 @@
 MAKEINFO = @MAKEINFO@
 MENCODER_PROG = @MENCODER_PROG@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MKVMERGE_PROG = @MKVMERGE_PROG@
-MPLAYER_MAJOR_VERSION = @MPLAYER_MAJOR_VERSION@
-MPLAYER_MINOR_VERSION = @MPLAYER_MINOR_VERSION@
-MPLAYER_PRE_VERSION = @MPLAYER_PRE_VERSION@
 MPLAYER_PROG = @MPLAYER_PROG@
-MPLAYER_RC_VERSION = @MPLAYER_RC_VERSION@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
-OCRAD_PROG = @OCRAD_PROG@
-OGGENC_PROG = @OGGENC_PROG@
 OGMDVD_GTK_LT_VERSION = @OGMDVD_GTK_LT_VERSION@
 OGMDVD_LT_VERSION = @OGMDVD_LT_VERSION@
 OGMJOB_LT_VERSION = @OGMJOB_LT_VERSION@
-OGMMERGE_PROG = @OGMMERGE_PROG@
 OGMRIP_CFLAGS = @OGMRIP_CFLAGS@
 OGMRIP_GTK_LT_VERSION = @OGMRIP_GTK_LT_VERSION@
 OGMRIP_LIBS = @OGMRIP_LIBS@
@@ -209,7 +217,6 @@
 OGMRIP_MICRO_VERSION = @OGMRIP_MICRO_VERSION@
 OGMRIP_MINOR_VERSION = @OGMRIP_MINOR_VERSION@
 OGMRIP_VERSION = @OGMRIP_VERSION@
-OGMSPLIT_PROG = @OGMSPLIT_PROG@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -288,10 +295,10 @@
 HFILE_GLOB = $(top_srcdir)/libogmjob/*.h
 CFILE_GLOB = $(top_srcdir)/libogmjob/*.c
 IGNORE_HFILES = ogmjob-marshal.h ogmjob.h
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 
 # We set GPATH here; this gives us semantics for GNU make
 # which are more like other make's VPATH, when it comes to
@@ -317,7 +324,12 @@
 	$(DOC_MODULE).prerequisites \
 	$(DOC_MODULE).signals
 
-CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
+REPORT_FILES = \
+	$(DOC_MODULE)-undocumented.txt \
+	$(DOC_MODULE)-undeclared.txt \
+	$(DOC_MODULE)-unused.txt
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
 all: all-am
 
 .SUFFIXES:
@@ -433,7 +445,8 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-local
 
 dvi: dvi-am
 
@@ -476,9 +489,9 @@
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
 	clean-libtool clean-local dist-hook distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
+	distclean-generic distclean-libtool distclean-local distdir \
+	dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local install-exec \
 	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic \
@@ -523,6 +536,9 @@
 tmpl.stamp: tmpl-build.stamp
 	@true
 
+tmpl/*.sgml:
+	@true
+
 #### xml ####
 
 sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
@@ -540,11 +556,11 @@
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building HTML'
 	@-chmod -R u+w $(srcdir)
-	rm -rf $(srcdir)/html 
+	rm -rf $(srcdir)/html
 	mkdir $(srcdir)/html
 	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo 'gtk-doc: Fixing cross-references' 
+	@echo 'gtk-doc: Fixing cross-references'
 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	touch html-build.stamp
 
@@ -554,11 +570,16 @@
 	rm -f *~ *.bak
 	rm -rf .libs
 
+distclean-local:
+	cd $(srcdir) && \
+	  rm -rf xml $(REPORT_FILES) \
+	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
 maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	cd $(srcdir) && rm -rf xml html
 
 install-data-local:
-	installfiles=`echo $(srcdir)/html/*`; \
+	-installfiles=`echo $(srcdir)/html/*`; \
 	if test "$$installfiles" = '$(srcdir)/html/*'; \
 	then echo '-- Nothing to install' ; \
 	else \
@@ -569,6 +590,8 @@
 	  done; \
 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
+	  which gtkdoc-rebase >/dev/null && \
+	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
 	fi
 
 uninstall-local:
@@ -589,9 +612,10 @@
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	-cp $(srcdir)/xml/*.xml $(distdir)/xml
 	cp $(srcdir)/html/* $(distdir)/html
-	if test -f $(srcdir)/$(DOC_MODULE).types; then \
-	  cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
-	fi
+	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	cd $(distdir) && rm -f $(DISTCLEANFILES)
+	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-bin.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-bin.xml
--- ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-bin.xml	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-bin.xml	2008-09-28 19:28:17.000000000 +0200
@@ -4,7 +4,7 @@
 
 
 
-OGMJobBin
+OGMJobBin
 3
 OGMJOB Library
 
@@ -15,24 +15,21 @@
 
 
 
-
+
 Synopsis
 
 
 
 #include <ogmjob-bin.h>
 
-
                     OGMJobBin;
 OGMJobSpawn*        ogmjob_bin_get_child                (OGMJobBin *bin);
-
 
 
 
-
+
 Object Hierarchy
 
-
   GObject
    +----OGMJobSpawn
          +----OGMJobContainer
@@ -48,7 +45,7 @@
 
 
 
-
+
 Description
 
 
@@ -57,17 +54,17 @@
 
 
 
-
+
 Details
-
-<anchor id="OGMJobBin-struct" role="struct"/>OGMJobBin
-OGMJobBintypedef struct _OGMJobBin OGMJobBin;
+
+OGMJobBin
+OGMJobBintypedef struct _OGMJobBin OGMJobBin;
 
 
 
-
-<anchor id="ogmjob-bin-get-child" role="function"/>ogmjob_bin_get_child ()
-ogmjob_bin_get_childOGMJobSpawn*        ogmjob_bin_get_child                (OGMJobBin *bin);
+
+ogmjob_bin_get_child ()
+ogmjob_bin_get_childOGMJobSpawn*        ogmjob_bin_get_child                (OGMJobBin *bin);
 
 Gets the child of the OGMJobBin, or NULL if the bin contains no child spawn.
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-container.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-container.xml
--- ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-container.xml	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-container.xml	2008-09-28 19:28:17.000000000 +0200
@@ -4,7 +4,7 @@
 
 
 
-OGMJobContainer
+OGMJobContainer
 3
 OGMJOB Library
 
@@ -15,14 +15,13 @@
 
 
 
-
+
 Synopsis
 
 
 
 #include <ogmjob-container.h>
 
-
 void                (*OGMJobCallback)                   (OGMJobSpawn *spawn,
                                                          gpointer data);
                     OGMJobContainer;
@@ -33,14 +32,12 @@
 void                ogmjob_container_foreach            (OGMJobContainer *container,
                                                          OGMJobCallback callback,
                                                          gpointer data);
-
 
 
 
-
+
 Object Hierarchy
 
-
   GObject
    +----OGMJobSpawn
          +----OGMJobContainer
@@ -55,17 +52,16 @@
 
 
 
-
+
 Signals
 
-
   "add"                                            : Run Last / No Recursion / No Hooks
   "remove"                                         : Run Last / No Recursion / No Hooks
 
 
 
 
-
+
 Description
 
 
@@ -74,11 +70,11 @@
 
 
 
-
+
 Details
-
-<anchor id="OGMJobCallback" role="function"/>OGMJobCallback ()
-OGMJobCallbackvoid                (*OGMJobCallback)                   (OGMJobSpawn *spawn,
+
+OGMJobCallback ()
+OGMJobCallbackvoid                (*OGMJobCallback)                   (OGMJobSpawn *spawn,
                                                          gpointer data);
 
 Specifies the type of functions passed to ogmjob_container_foreach().
@@ -92,15 +88,15 @@
  The user data
 
 
-
-<anchor id="OGMJobContainer-struct" role="struct"/>OGMJobContainer
-OGMJobContainertypedef struct _OGMJobContainer OGMJobContainer;
+
+OGMJobContainer
+OGMJobContainertypedef struct _OGMJobContainer OGMJobContainer;
 
 
 
-
-<anchor id="ogmjob-container-add" role="function"/>ogmjob_container_add ()
-ogmjob_container_addvoid                ogmjob_container_add                (OGMJobContainer *container,
+
+ogmjob_container_add ()
+ogmjob_container_addvoid                ogmjob_container_add                (OGMJobContainer *container,
                                                          OGMJobSpawn *spawn);
 
 Adds spawn to container.
@@ -114,9 +110,9 @@
  An OGMJobSpawn
 
 
-
-<anchor id="ogmjob-container-remove" role="function"/>ogmjob_container_remove ()
-ogmjob_container_removevoid                ogmjob_container_remove             (OGMJobContainer *container,
+
+ogmjob_container_remove ()
+ogmjob_container_removevoid                ogmjob_container_remove             (OGMJobContainer *container,
                                                          OGMJobSpawn *spawn);
 
 Removes spawn from container.
@@ -130,9 +126,9 @@
  An OGMJobSpawn
 
 
-
-<anchor id="ogmjob-container-foreach" role="function"/>ogmjob_container_foreach ()
-ogmjob_container_foreachvoid                ogmjob_container_foreach            (OGMJobContainer *container,
+
+ogmjob_container_foreach ()
+ogmjob_container_foreachvoid                ogmjob_container_foreach            (OGMJobContainer *container,
                                                          OGMJobCallback callback,
                                                          gpointer data);
 
@@ -153,10 +149,10 @@
 
 
 
-
+
 Signal Details
-<anchor id="OGMJobContainer-add"/>The "add" signal
-OGMJobContainer::addvoid                user_function                      (OGMJobContainer *container,
+The <literal>"add"</literal> signal
+OGMJobContainer::addvoid                user_function                      (OGMJobContainer *container,
                                                         OGMJobSpawn     *child,
                                                         gpointer         user_data)      : Run Last / No Recursion / No Hooks
 
@@ -172,8 +168,8 @@
 
 user_data :
 user data set when the signal handler was connected.
-<anchor id="OGMJobContainer-remove"/>The "remove" signal
-OGMJobContainer::removevoid                user_function                      (OGMJobContainer *container,
+The <literal>"remove"</literal> signal
+OGMJobContainer::removevoid                user_function                      (OGMJobContainer *container,
                                                         OGMJobSpawn     *child,
                                                         gpointer         user_data)      : Run Last / No Recursion / No Hooks
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-exec.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-exec.xml
--- ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-exec.xml	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-exec.xml	2008-09-28 19:28:17.000000000 +0200
@@ -4,7 +4,7 @@
 
 
 
-OGMJobExec
+OGMJobExec
 3
 OGMJOB Library
 
@@ -15,14 +15,13 @@
 
 
 
-
+
 Synopsis
 
 
 
 #include <ogmjob-exec.h>
 
-
 gdouble             (*OGMJobWatch)                      (OGMJobExec *exec,
                                                          const gchar *buffer,
                                                          gpointer data);
@@ -39,14 +38,12 @@
                                                          gboolean watch_out,
                                                          gboolean watch_err,
                                                          gboolean swapped);
-
 
 
 
-
+
 Object Hierarchy
 
-
   GObject
    +----OGMJobSpawn
          +----OGMJobExec
@@ -61,7 +58,7 @@
 
 
 
-
+
 Description
 
 
@@ -70,11 +67,11 @@
 
 
 
-
+
 Details
-
-<anchor id="OGMJobWatch" role="function"/>OGMJobWatch ()
-OGMJobWatchgdouble             (*OGMJobWatch)                      (OGMJobExec *exec,
+
+OGMJobWatch ()
+OGMJobWatchgdouble             (*OGMJobWatch)                      (OGMJobExec *exec,
                                                          const gchar *buffer,
                                                          gpointer data);
 
@@ -95,15 +92,15 @@
 Returns : The progress made, or -1
 
 
-
-<anchor id="OGMJobExec-struct" role="struct"/>OGMJobExec
-OGMJobExectypedef struct _OGMJobExec OGMJobExec;
+
+OGMJobExec
+OGMJobExectypedef struct _OGMJobExec OGMJobExec;
 
 
 
-
-<anchor id="ogmjob-exec-new" role="function"/>ogmjob_exec_new ()
-ogmjob_exec_newOGMJobSpawn*        ogmjob_exec_new                     (const gchar *command_line);
+
+ogmjob_exec_new ()
+ogmjob_exec_newOGMJobSpawn*        ogmjob_exec_new                     (const gchar *command_line);
 
 Creates a new OGMJobExec.
 
@@ -115,9 +112,9 @@
 Returns : The new OGMJobExec
 
 
-
-<anchor id="ogmjob-exec-newv" role="function"/>ogmjob_exec_newv ()
-ogmjob_exec_newvOGMJobSpawn*        ogmjob_exec_newv                    (gchar **argv);
+
+ogmjob_exec_newv ()
+ogmjob_exec_newvOGMJobSpawn*        ogmjob_exec_newv                    (gchar **argv);
 
 Creates a new OGMJobExec.
 
@@ -129,9 +126,9 @@
 Returns : The new OGMJobExec
 
 
-
-<anchor id="ogmjob-exec-get-status" role="function"/>ogmjob_exec_get_status ()
-ogmjob_exec_get_statusgint                ogmjob_exec_get_status              (OGMJobExec *exec);
+
+ogmjob_exec_get_status ()
+ogmjob_exec_get_statusgint                ogmjob_exec_get_status              (OGMJobExec *exec);
 
 Returns the execution status.
 
@@ -143,9 +140,9 @@
 Returns : The execution status
 
 
-
-<anchor id="ogmjob-exec-add-watch" role="function"/>ogmjob_exec_add_watch ()
-ogmjob_exec_add_watchvoid                ogmjob_exec_add_watch               (OGMJobExec *exec,
+
+ogmjob_exec_add_watch ()
+ogmjob_exec_add_watchvoid                ogmjob_exec_add_watch               (OGMJobExec *exec,
                                                          OGMJobWatch watch_func,
                                                          gpointer watch_data);
 
@@ -163,9 +160,9 @@
  User data
 
 
-
-<anchor id="ogmjob-exec-add-watch-full" role="function"/>ogmjob_exec_add_watch_full ()
-ogmjob_exec_add_watch_fullvoid                ogmjob_exec_add_watch_full          (OGMJobExec *exec,
+
+ogmjob_exec_add_watch_full ()
+ogmjob_exec_add_watch_fullvoid                ogmjob_exec_add_watch_full          (OGMJobExec *exec,
                                                          OGMJobWatch watch_func,
                                                          gpointer watch_data,
                                                          gboolean watch_out,
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-list.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-list.xml
--- ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-list.xml	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-list.xml	2008-09-28 19:28:17.000000000 +0200
@@ -4,7 +4,7 @@
 
 
 
-OGMJobList
+OGMJobList
 3
 OGMJOB Library
 
@@ -15,24 +15,21 @@
 
 
 
-
+
 Synopsis
 
 
 
 #include <ogmjob-list.h>
 
-
                     OGMJobList;
 GList*              ogmjob_list_get_children            (OGMJobList *list);
-
 
 
 
-
+
 Object Hierarchy
 
-
   GObject
    +----OGMJobSpawn
          +----OGMJobContainer
@@ -50,7 +47,7 @@
 
 
 
-
+
 Description
 
 
@@ -59,17 +56,17 @@
 
 
 
-
+
 Details
-
-<anchor id="OGMJobList-struct" role="struct"/>OGMJobList
-OGMJobListtypedef struct _OGMJobList OGMJobList;
+
+OGMJobList
+OGMJobListtypedef struct _OGMJobList OGMJobList;
 
 
 
-
-<anchor id="ogmjob-list-get-children" role="function"/>ogmjob_list_get_children ()
-ogmjob_list_get_childrenGList*              ogmjob_list_get_children            (OGMJobList *list);
+
+ogmjob_list_get_children ()
+ogmjob_list_get_childrenGList*              ogmjob_list_get_children            (OGMJobList *list);
 
 Returns the list's children.
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-log.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-log.xml
--- ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-log.xml	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-log.xml	2008-09-28 19:28:17.000000000 +0200
@@ -4,7 +4,7 @@
 
 
 
-Logs
+Logs
 3
 OGMJOB Library
 
@@ -15,14 +15,13 @@
 
 
 
-
+
 Synopsis
 
 
 
 #include <ogmjob-log.h>
 
-
 gboolean            ogmjob_log_open                     (const gchar *filename,
                                                          GError **error);
 gboolean            ogmjob_log_close                    (GError **error);
@@ -44,7 +43,7 @@
 
 
 
-
+
 Description
 
 
@@ -53,11 +52,11 @@
 
 
 
-
+
 Details
-
-<anchor id="ogmjob-log-open" role="function"/>ogmjob_log_open ()
-ogmjob_log_opengboolean            ogmjob_log_open                     (const gchar *filename,
+
+ogmjob_log_open ()
+ogmjob_log_opengboolean            ogmjob_log_open                     (const gchar *filename,
                                                          GError **error);
 
 Opens a new log file.
@@ -73,9 +72,9 @@
 Returns : TRUE, when no error
 
 
-
-<anchor id="ogmjob-log-close" role="function"/>ogmjob_log_close ()
-ogmjob_log_closegboolean            ogmjob_log_close                    (GError **error);
+
+ogmjob_log_close ()
+ogmjob_log_closegboolean            ogmjob_log_close                    (GError **error);
 
 Closes the log file.
 
@@ -87,9 +86,9 @@
 Returns : TRUE, when no error
 
 
-
-<anchor id="ogmjob-log-write" role="function"/>ogmjob_log_write ()
-ogmjob_log_writevoid                ogmjob_log_write                    (const gchar *str);
+
+ogmjob_log_write ()
+ogmjob_log_writevoid                ogmjob_log_write                    (const gchar *str);
 
 Logs some information on stdout, stderr, and/or a file.
 
@@ -99,9 +98,9 @@
  A string to log
 
 
-
-<anchor id="ogmjob-log-printf" role="function"/>ogmjob_log_printf ()
-ogmjob_log_printfvoid                ogmjob_log_printf                   (const gchar *format,
+
+ogmjob_log_printf ()
+ogmjob_log_printfvoid                ogmjob_log_printf                   (const gchar *format,
                                                          ...);
 
 Logs some formatted information on stdout, stderr, and/or a file.
@@ -115,9 +114,9 @@
  The parameters of the format string
 
 
-
-<anchor id="ogmjob-log-set-print-stdout" role="function"/>ogmjob_log_set_print_stdout ()
-ogmjob_log_set_print_stdoutvoid                ogmjob_log_set_print_stdout         (gboolean log_stdout);
+
+ogmjob_log_set_print_stdout ()
+ogmjob_log_set_print_stdoutvoid                ogmjob_log_set_print_stdout         (gboolean log_stdout);
 
 Sets whether to log information on stdout.
 
@@ -127,9 +126,9 @@
  TRUE to log on stdout
 
 
-
-<anchor id="ogmjob-log-get-print-stdout" role="function"/>ogmjob_log_get_print_stdout ()
-ogmjob_log_get_print_stdoutgboolean            ogmjob_log_get_print_stdout         (void);
+
+ogmjob_log_get_print_stdout ()
+ogmjob_log_get_print_stdoutgboolean            ogmjob_log_get_print_stdout         (void);
 
 Gets whether to log information on stdout.
 
@@ -138,9 +137,9 @@
 Returns : TRUE if log on stdout
 
 
-
-<anchor id="ogmjob-log-set-print-stderr" role="function"/>ogmjob_log_set_print_stderr ()
-ogmjob_log_set_print_stderrvoid                ogmjob_log_set_print_stderr         (gboolean log_stderr);
+
+ogmjob_log_set_print_stderr ()
+ogmjob_log_set_print_stderrvoid                ogmjob_log_set_print_stderr         (gboolean log_stderr);
 
 Sets whether to log information on stderr.
 
@@ -150,9 +149,9 @@
  TRUE to log on stderr
 
 
-
-<anchor id="ogmjob-log-get-print-stderr" role="function"/>ogmjob_log_get_print_stderr ()
-ogmjob_log_get_print_stderrgboolean            ogmjob_log_get_print_stderr         (void);
+
+ogmjob_log_get_print_stderr ()
+ogmjob_log_get_print_stderrgboolean            ogmjob_log_get_print_stderr         (void);
 
 Gets whether to log information on stderr.
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-pipeline.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-pipeline.xml
--- ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-pipeline.xml	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-pipeline.xml	2008-09-28 19:28:17.000000000 +0200
@@ -4,7 +4,7 @@
 
 
 
-OGMJobPipeline
+OGMJobPipeline
 3
 OGMJOB Library
 
@@ -15,24 +15,21 @@
 
 
 
-
+
 Synopsis
 
 
 
 #include <ogmjob-pipeline.h>
 
-
                     OGMJobPipeline;
 OGMJobSpawn*        ogmjob_pipeline_new                 (void);
-
 
 
 
-
+
 Object Hierarchy
 
-
   GObject
    +----OGMJobSpawn
          +----OGMJobContainer
@@ -49,7 +46,7 @@
 
 
 
-
+
 Description
 
 
@@ -58,17 +55,17 @@
 
 
 
-
+
 Details
-
-<anchor id="OGMJobPipeline-struct" role="struct"/>OGMJobPipeline
-OGMJobPipelinetypedef struct _OGMJobPipeline OGMJobPipeline;
+
+OGMJobPipeline
+OGMJobPipelinetypedef struct _OGMJobPipeline OGMJobPipeline;
 
 
 
-
-<anchor id="ogmjob-pipeline-new" role="function"/>ogmjob_pipeline_new ()
-ogmjob_pipeline_newOGMJobSpawn*        ogmjob_pipeline_new                 (void);
+
+ogmjob_pipeline_new ()
+ogmjob_pipeline_newOGMJobSpawn*        ogmjob_pipeline_new                 (void);
 
 Creates a new OGMJobPipeline.
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-queue.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-queue.xml
--- ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-queue.xml	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-queue.xml	2008-09-28 19:28:17.000000000 +0200
@@ -4,7 +4,7 @@
 
 
 
-OGMJobQueue
+OGMJobQueue
 3
 OGMJOB Library
 
@@ -15,24 +15,21 @@
 
 
 
-
+
 Synopsis
 
 
 
 #include <ogmjob-queue.h>
 
-
                     OGMJobQueue;
 OGMJobSpawn*        ogmjob_queue_new                    (void);
-
 
 
 
-
+
 Object Hierarchy
 
-
   GObject
    +----OGMJobSpawn
          +----OGMJobContainer
@@ -49,7 +46,7 @@
 
 
 
-
+
 Description
 
 
@@ -58,17 +55,17 @@
 
 
 
-
+
 Details
-
-<anchor id="OGMJobQueue-struct" role="struct"/>OGMJobQueue
-OGMJobQueuetypedef struct _OGMJobQueue OGMJobQueue;
+
+OGMJobQueue
+OGMJobQueuetypedef struct _OGMJobQueue OGMJobQueue;
 
 
 
-
-<anchor id="ogmjob-queue-new" role="function"/>ogmjob_queue_new ()
-ogmjob_queue_newOGMJobSpawn*        ogmjob_queue_new                    (void);
+
+ogmjob_queue_new ()
+ogmjob_queue_newOGMJobSpawn*        ogmjob_queue_new                    (void);
 
 Creates a new OGMJobQueue.
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-spawn.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-spawn.xml
--- ogmrip-0.11.1/docs/reference/ogmjob/xml/ogmjob-spawn.xml	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmjob/xml/ogmjob-spawn.xml	2008-09-28 19:28:17.000000000 +0200
@@ -4,7 +4,7 @@
 
 
 
-OGMJobSpawn
+OGMJobSpawn
 3
 OGMJOB Library
 
@@ -15,14 +15,13 @@
 
 
 
-
+
 Synopsis
 
 
 
 #include <ogmjob-spawn.h>
 
-
                     OGMJobSpawn;
 gint                ogmjob_spawn_run                    (OGMJobSpawn *spawn,
                                                          GError **error);
@@ -37,14 +36,12 @@
                                                          OGMJobSpawn *parent);
 void                ogmjob_spawn_propagate_error        (OGMJobSpawn *spawn,
                                                          GError *error);
-
 
 
 
-
+
 Object Hierarchy
 
-
   GObject
    +----OGMJobSpawn
          +----OGMJobContainer
@@ -58,10 +55,9 @@
 
 
 
-
+
 Signals
 
-
   "cancel"                                         : Run Last / No Recursion / No Hooks
   "progress"                                       : Run Last / No Recursion / No Hooks
   "resume"                                         : Run Last / No Recursion / No Hooks
@@ -71,7 +67,7 @@
 
 
 
-
+
 Description
 
 
@@ -80,17 +76,17 @@
 
 
 
-
+
 Details
-
-<anchor id="OGMJobSpawn-struct" role="struct"/>OGMJobSpawn
-OGMJobSpawntypedef struct _OGMJobSpawn OGMJobSpawn;
+
+OGMJobSpawn
+OGMJobSpawntypedef struct _OGMJobSpawn OGMJobSpawn;
 
 
 
-
-<anchor id="ogmjob-spawn-run" role="function"/>ogmjob_spawn_run ()
-ogmjob_spawn_rungint                ogmjob_spawn_run                    (OGMJobSpawn *spawn,
+
+ogmjob_spawn_run ()
+ogmjob_spawn_rungint                ogmjob_spawn_run                    (OGMJobSpawn *spawn,
                                                          GError **error);
 
 Runs a spawn.
@@ -106,9 +102,9 @@
 Returns : An OGMJobResultType
 
 
-
-<anchor id="ogmjob-spawn-cancel" role="function"/>ogmjob_spawn_cancel ()
-ogmjob_spawn_cancelvoid                ogmjob_spawn_cancel                 (OGMJobSpawn *spawn);
+
+ogmjob_spawn_cancel ()
+ogmjob_spawn_cancelvoid                ogmjob_spawn_cancel                 (OGMJobSpawn *spawn);
 
 Cancels a spawn.
 
@@ -118,9 +114,9 @@
  An OGMJobSpawn
 
 
-
-<anchor id="ogmjob-spawn-suspend" role="function"/>ogmjob_spawn_suspend ()
-ogmjob_spawn_suspendvoid                ogmjob_spawn_suspend                (OGMJobSpawn *spawn);
+
+ogmjob_spawn_suspend ()
+ogmjob_spawn_suspendvoid                ogmjob_spawn_suspend                (OGMJobSpawn *spawn);
 
 Suspends a spawn.
 
@@ -130,9 +126,9 @@
  An OGMJobSpawn
 
 
-
-<anchor id="ogmjob-spawn-resume" role="function"/>ogmjob_spawn_resume ()
-ogmjob_spawn_resumevoid                ogmjob_spawn_resume                 (OGMJobSpawn *spawn);
+
+ogmjob_spawn_resume ()
+ogmjob_spawn_resumevoid                ogmjob_spawn_resume                 (OGMJobSpawn *spawn);
 
 Resumes a suspended spawn.
 
@@ -142,39 +138,39 @@
  An OGMJobSpawn
 
 
-
-<anchor id="ogmjob-spawn-set-async" role="function"/>ogmjob_spawn_set_async ()
-ogmjob_spawn_set_asyncvoid                ogmjob_spawn_set_async              (OGMJobSpawn *spawn,
+
+ogmjob_spawn_set_async ()
+ogmjob_spawn_set_asyncvoid                ogmjob_spawn_set_async              (OGMJobSpawn *spawn,
                                                          gboolean async);
 
+Sets whether to run the spawn asynchronously.
+
 
 
 spawn :
-
+ An OGMJobSpawn
 
 async :
-
-
-
+ TRUE if asynchronous
 
 
-
-<anchor id="ogmjob-spawn-get-async" role="function"/>ogmjob_spawn_get_async ()
-ogmjob_spawn_get_asyncgboolean            ogmjob_spawn_get_async              (OGMJobSpawn *spawn);
+
+ogmjob_spawn_get_async ()
+ogmjob_spawn_get_asyncgboolean            ogmjob_spawn_get_async              (OGMJobSpawn *spawn);
+
+Gets whether to run the spawn asynchronously.
 
 
 
 spawn :
-
+ An OGMJobSpawn
 
-Returns :
-
-
+Returns : TRUE if asynchronous
 
 
-
-<anchor id="ogmjob-spawn-get-parent" role="function"/>ogmjob_spawn_get_parent ()
-ogmjob_spawn_get_parentOGMJobSpawn*        ogmjob_spawn_get_parent             (OGMJobSpawn *spawn);
+
+ogmjob_spawn_get_parent ()
+ogmjob_spawn_get_parentOGMJobSpawn*        ogmjob_spawn_get_parent             (OGMJobSpawn *spawn);
 
 Returns the parent container of a spawn.
 
@@ -186,9 +182,9 @@
 Returns : An OGMJobSpawn, or NULL
 
 
-
-<anchor id="ogmjob-spawn-set-parent" role="function"/>ogmjob_spawn_set_parent ()
-ogmjob_spawn_set_parentvoid                ogmjob_spawn_set_parent             (OGMJobSpawn *spawn,
+
+ogmjob_spawn_set_parent ()
+ogmjob_spawn_set_parentvoid                ogmjob_spawn_set_parent             (OGMJobSpawn *spawn,
                                                          OGMJobSpawn *parent);
 
 Sets the container as the parent of a widget.
@@ -202,42 +198,42 @@
  The parent container
 
 
-
-<anchor id="ogmjob-spawn-propagate-error" role="function"/>ogmjob_spawn_propagate_error ()
-ogmjob_spawn_propagate_errorvoid                ogmjob_spawn_propagate_error        (OGMJobSpawn *spawn,
+
+ogmjob_spawn_propagate_error ()
+ogmjob_spawn_propagate_errorvoid                ogmjob_spawn_propagate_error        (OGMJobSpawn *spawn,
                                                          GError *error);
 
+Propagates error in spawn.
+
 
 
 spawn :
-
+ An OGMJobSpawn
 
 error :
-
-
-
+ An GError
 
 
 
 
 
-
+
 Signal Details
-<anchor id="OGMJobSpawn-cancel"/>The "cancel" signal
-OGMJobSpawn::cancelvoid                user_function                      (OGMJobSpawn *container,
+The <literal>"cancel"</literal> signal
+OGMJobSpawn::cancelvoid                user_function                      (OGMJobSpawn *spawn,
                                                         gpointer     user_data)      : Run Last / No Recursion / No Hooks
 
-Emitted each time a spawn has been canceled.
+Emitted each time a spawn is canceled.
 
 
 
-container :
+spawn :
  the spawn that received the signal
 
 user_data :
 user data set when the signal handler was connected.
-<anchor id="OGMJobSpawn-progress"/>The "progress" signal
-OGMJobSpawn::progressvoid                user_function                      (OGMJobSpawn *container,
+The <literal>"progress"</literal> signal
+OGMJobSpawn::progressvoid                user_function                      (OGMJobSpawn *spawn,
                                                         gdouble      fraction,
                                                         gpointer     user_data)      : Run Last / No Recursion / No Hooks
 
@@ -245,29 +241,29 @@
 
 
 
-container :
+spawn :
  the spawn that received the signal
 
 fraction :
- fraction of the task that's been completed
+ fraction of the spawn that's been completed
 
 user_data :
 user data set when the signal handler was connected.
-<anchor id="OGMJobSpawn-resume"/>The "resume" signal
-OGMJobSpawn::resumevoid                user_function                      (OGMJobSpawn *container,
+The <literal>"resume"</literal> signal
+OGMJobSpawn::resumevoid                user_function                      (OGMJobSpawn *spawn,
                                                         gpointer     user_data)      : Run Last / No Recursion / No Hooks
 
 Emitted each time a suspended spawn is resumed.
 
 
 
-container :
+spawn :
  the spawn that received the signal
 
 user_data :
 user data set when the signal handler was connected.
-<anchor id="OGMJobSpawn-run"/>The "run" signal
-OGMJobSpawn::rungint                user_function                      (OGMJobSpawn *spawn,
+The <literal>"run"</literal> signal
+OGMJobSpawn::rungint                user_function                      (OGMJobSpawn *spawn,
                                                         gpointer     user_data)      : Run Last / No Recursion / No Hooks
 
 Emitted each time a spawn is run.
@@ -281,15 +277,15 @@
 user data set when the signal handler was connected.
 Returns : An OGMJobResultType
 
-<anchor id="OGMJobSpawn-suspend"/>The "suspend" signal
-OGMJobSpawn::suspendvoid                user_function                      (OGMJobSpawn *container,
+The <literal>"suspend"</literal> signal
+OGMJobSpawn::suspendvoid                user_function                      (OGMJobSpawn *spawn,
                                                         gpointer     user_data)      : Run Last / No Recursion / No Hooks
 
 Emitted each time a spawn is suspended.
 
 
 
-container :
+spawn :
  the spawn that received the signal
 
 user_data :
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/abstract-classes.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/abstract-classes.html
--- ogmrip-0.11.1/docs/reference/ogmrip/html/abstract-classes.html	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmrip/html/abstract-classes.html	2008-09-28 19:28:17.000000000 +0200
@@ -1,20 +1,20 @@
 
 
 
-
+
 Abstract Base Classes
-
+
 
-
-
+
+
 
-
+
 
-
-
+
+
 
 
-
+
 
 
 
@@ -33,21 +33,27 @@
 Abstract Base Classes
 

 

-OGMRipCodec — Base class for codecs
+OGMRipCodec — Base class for codecs
 

 

-OGMRipVideo — Base class for video codecs
+OGMRipVideoCodec — Base class for video codecs
 

 

-OGMRipAudio — Base class for audio codecs
+OGMRipAudioCodec — Base class for audio codecs
 

 

-OGMRipSubp — Base class for subtitles codecs
+OGMRipSubpCodec — Base class for subtitles codecs
 

 

-OGMRipContainer — Base class for containers
+OGMRipContainer — Base class for containers
+

+

+OGMRipLavc — A video codec to encode in Mpeg4
 

 

 
+

+

+          Generated by GTK-Doc V1.10

 
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/audio-codecs.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/audio-codecs.html
--- ogmrip-0.11.1/docs/reference/ogmrip/html/audio-codecs.html	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmrip/html/audio-codecs.html	2008-09-28 19:28:17.000000000 +0200
@@ -1,20 +1,20 @@
 
 
 
-
+
 Audio Codecs
-
+
 
-
+
 
 
-
+
 
-
-
+
+
 
 
-
+
 
 
 
@@ -33,21 +33,24 @@
 Audio Codecs
 

 

-OGMRipAac — An audio codec to encode in AAC
+OGMRipAac — An audio codec to encode in AAC
 

 

-OGMRipMp3 — An audio codec to encode in MP3
+OGMRipMp3 — An audio codec to encode in MP3
 

 

-OGMRipVorbis — An audio codec to encode in Ogg Vorbis
+OGMRipVorbis — An audio codec to encode in Ogg Vorbis
 

 

-OGMRipWav — An audio codec to encode in wav
+OGMRipWav — An audio codec to encode in wav
 

 

-OGMRipAudioCopy — A codec to copy an audio stream
+OGMRipAudioCopy — A codec to copy an audio stream
 

 

 
+

+

+          Generated by GTK-Doc V1.10

 
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/containers.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/containers.html
--- ogmrip-0.11.1/docs/reference/ogmrip/html/containers.html	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmrip/html/containers.html	2008-09-28 19:28:17.000000000 +0200
@@ -1,20 +1,20 @@
 
 
 
-
+
 Containers
-
+
 
-
-
+
+
 
-
+
 
-
-
+
+
 
 
-
+
 
 
 
@@ -33,18 +33,21 @@
 Containers
 

 

-OGMRipAvi — The AVI container
+OGMRipAvi — The AVI container
 

 

-OGMRipMatroska — The Matroska container
+OGMRipMatroska — The Matroska container
 

 

-OGMRipMp4 — The MP4 container
+OGMRipMp4 — The MP4 container
 

 

-OGMRipOgg — The Ogg Media container
+OGMRipOgg — The Ogg Media container
 

 

 
+

+

+          Generated by GTK-Doc V1.10

 
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/index.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/index.html
--- ogmrip-0.11.1/docs/reference/ogmrip/html/index.html	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmrip/html/index.html	2008-09-28 19:28:17.000000000 +0200
@@ -1,24 +1,25 @@
 
 
 
-
+
 OGMRip Reference Manual
-
+
 
-
-
+
+
 
-
-
+
+
 
 
-
+
 
 
 
 
 
-

+
+

 

 

 

 
 
 
spawn :
+
spawn :
 An OGMJobSpawn
 
 

 
error :
-
-
+
error :
 An GError
 
 

 
 
 
 
 
container :
spawn :

  the spawn that received the signal
 
 

 
user_data :
user_data :

 user data set when the signal handler was connected.
 

 
 
 
 
 
container :
spawn :

  the spawn that received the signal
 
 

 
fraction : fraction of the task that's been completed
+
fraction :
 fraction of the spawn that's been completed
 
 

 
user_data :
user_data :

 user data set when the signal handler was connected.
 

 
 
 
 
 
container :
spawn :

  the spawn that received the signal
 
 

 
user_data :
user_data :

 user data set when the signal handler was connected.
 

 
 
 
 
 
spawn :
spawn :

  the spawn that received the signal
 
 

 
user_data :
user_data :

 user data set when the signal handler was connected.
 

 
Returns :
Returns :

  An OGMJobResultType
 
 

 
 
 
 
container :
spawn :

  the spawn that received the signal
 
 

 
user_data :
user_data :

 user data set when the signal handler was connected.
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

@@ -30,22 +31,25 @@
 
I. OGMRip Core Reference

 

 

-Version information — Variables and functions to check the OGMRip and MPlayer versions
+Version information — Variables and functions to check the OGMRip and MPlayer versions
 

 

-Enumerations — Public enumerated types used throughout OGMRip
+Enumerations — Public enumerated types used throughout OGMRip
 

 

-Plugins System — Functions for manipulating the plugins
+Plugins System — Functions for manipulating the plugins
 

 

-Edit Decision List — Functions for manipulating EDL
+Edit Decision List — Functions for manipulating EDL
 

 

-Filesystem — Functions for handling files, directories, links and fifos
+Filesystem — Functions for handling files, directories, links and fifos
 

 

-Files — Structures to manipulate media files
+Files — Structures to manipulate media files
+

+

+Mplayer — Common wrapper functions for mplayer and mencoder
 

 

 
II. OGMRip Objects

@@ -53,28 +57,31 @@
 
Abstract Base Classes

 

 

-OGMRipCodec — Base class for codecs
+OGMRipCodec — Base class for codecs
+

+

+OGMRipVideoCodec — Base class for video codecs
 

 

-OGMRipVideo — Base class for video codecs
+OGMRipAudioCodec — Base class for audio codecs
 

 

-OGMRipAudio — Base class for audio codecs
+OGMRipSubpCodec — Base class for subtitles codecs
 

 

-OGMRipSubp — Base class for subtitles codecs
+OGMRipContainer — Base class for containers
 

 

-OGMRipContainer — Base class for containers
+OGMRipLavc — A video codec to encode in Mpeg4
 

 

 
Misceleanous

 

 

-OGMRipChapters — A codec to extract chapters information
+OGMRipChapters — A codec to extract chapters information
 

 

-OGMRipDvdcpy — A codec to copy a DVD title
+OGMRipDvdcpy — A codec to copy a DVD title
 

 

 
@@ -83,61 +90,65 @@
 
Containers

 

 

-OGMRipAvi — The AVI container
+OGMRipAvi — The AVI container
 

 

-OGMRipMatroska — The Matroska container
+OGMRipMatroska — The Matroska container
 

 

-OGMRipMp4 — The MP4 container
+OGMRipMp4 — The MP4 container
 

 

-OGMRipOgg — The Ogg Media container
+OGMRipOgg — The Ogg Media container
 

 

 
Video Codecs

 

 

-OGMRipLavc — A video codec to encode in Mpeg4
+OGMRipLavcMpeg4
 

 

-OGMRipTheora — A video codec to encode in theora
+OGMRipTheora — A video codec to encode in theora
 

 

-OGMRipX264 — A video codec to encode in X264
+OGMRipX264 — A video codec to encode in X264
 

 

-OGMRipXvid — A video codec to encode in XviD
+OGMRipXvid — A video codec to encode in XviD
 

 

 
Audio Codecs

 

 

-OGMRipAac — An audio codec to encode in AAC
+OGMRipAac — An audio codec to encode in AAC
 

 

-OGMRipMp3 — An audio codec to encode in MP3
+OGMRipMp3 — An audio codec to encode in MP3
 

 

-OGMRipVorbis — An audio codec to encode in Ogg Vorbis
+OGMRipVorbis — An audio codec to encode in Ogg Vorbis
 

 

-OGMRipWav — An audio codec to encode in wav
+OGMRipWav — An audio codec to encode in wav
 

 

-OGMRipAudioCopy — A codec to copy an audio stream
+OGMRipAudioCopy — A codec to copy an audio stream
 

 

 
Subtitles Codecs

 

 

-OGMRipSrt — A subtitles codec to extract in SubRip Text
+OGMRipSrt — A subtitles codec to extract in SubRip Text
 

 

-OGMRipVobSub — A subtitles codec to extract in VobSub
+OGMRipVobSub — A subtitles codec to extract in VobSub
-
+
+
+
+ Generated by GTK-Doc V1.10
+ diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/index.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/index.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/html/index.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/index.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -1,85 +1,36 @@ + + + + + + + - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + @@ -93,6 +44,7 @@ + @@ -102,6 +54,7 @@ + @@ -109,6 +62,7 @@ + @@ -117,6 +71,7 @@ + @@ -124,9 +79,10 @@ + + + - - @@ -137,10 +93,10 @@ - - - - + + + + @@ -152,28 +108,19 @@ - + + + + + - - - - - - - - - - - - - @@ -194,15 +141,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -213,6 +186,7 @@ + @@ -221,96 +195,134 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -344,8 +356,12 @@ + + + + @@ -353,67 +369,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/misc.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/misc.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/misc.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/misc.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + Misceleanous - + - - + + - + - - + + - + @@ -22,7 +22,7 @@ - + @@ -33,12 +33,15 @@ Misceleanous
-OGMRipChapters — A codec to extract chapters information +OGMRipChapters — A codec to extract chapters information
-OGMRipDvdcpy — A codec to copy a DVD title +OGMRipDvdcpy — A codec to copy a DVD title
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-api.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-api.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-api.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-api.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - -Part II. OGMRip Objects - + +Part II. OGMRip Objects + - + - + - - + + - + @@ -22,20 +22,58 @@ - - + +

-Part II. OGMRip Objects

+Part II. OGMRip Objects

This section contains the API reference for OGMRip. All the public interfaces are documented here.

+
+

Table of Contents

+
+
Abstract Base Classes
+
+
+OGMRipCodec — Base class for codecs +
+
+OGMRipVideoCodec — Base class for video codecs +
+
+OGMRipAudioCodec — Base class for audio codecs +
+
+OGMRipSubpCodec — Base class for subtitles codecs +
+
+OGMRipContainer — Base class for containers +
+
+OGMRipLavc — A video codec to encode in Mpeg4 +
+
+
Misceleanous
+
+
+OGMRipChapters — A codec to extract chapters information +
+
+OGMRipDvdcpy — A codec to copy a DVD title +
+
+
+ +
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipAudioCodec.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipAudioCodec.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipAudioCodec.html 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipAudioCodec.html 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,604 @@ + + + + +OGMRipAudioCodec + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

OGMRipAudioCodec

+

OGMRipAudioCodec — Base class for audio codecs

+
+
+

Synopsis

+
+
+#include <ogmrip-audio-codec.h>
+
+                    OGMRipAudioCodec;
+OGMDvdAudioStream*  ogmrip_audio_codec_get_dvd_audio_stream
+                                                        (OGMRipAudioCodec *audio);
+void                ogmrip_audio_codec_set_dvd_audio_stream
+                                                        (OGMRipAudioCodec *audio,
+                                                         OGMDvdAudioStream *stream);
+gint                ogmrip_audio_codec_get_channels     (OGMRipAudioCodec *audio);
+void                ogmrip_audio_codec_set_channels     (OGMRipAudioCodec *audio,
+                                                         OGMDvdAudioChannels channels);
+gboolean            ogmrip_audio_codec_get_fast         (OGMRipAudioCodec *audio);
+void                ogmrip_audio_codec_set_fast         (OGMRipAudioCodec *audio,
+                                                         gboolean fast);
+gboolean            ogmrip_audio_codec_get_normalize    (OGMRipAudioCodec *audio);
+void                ogmrip_audio_codec_set_normalize    (OGMRipAudioCodec *audio,
+                                                         gboolean normalize);
+gint                ogmrip_audio_codec_get_quality      (OGMRipAudioCodec *audio);
+void                ogmrip_audio_codec_set_quality      (OGMRipAudioCodec *audio,
+                                                         guint quality);
+gint                ogmrip_audio_codec_get_sample_rate  (OGMRipAudioCodec *audio);
+void                ogmrip_audio_codec_set_sample_rate  (OGMRipAudioCodec *audio,
+                                                         guint srate);
+gint                ogmrip_audio_codec_get_samples_per_frame
+                                                        (OGMRipAudioCodec *audio);
+
+
+
+

Object Hierarchy

+
+  GObject
+   +----OGMJobSpawn
+         +----OGMJobContainer
+               +----OGMJobBin
+                     +----OGMRipCodec
+                           +----OGMRipAudioCodec
+
+
+
+

Properties

+
+  "channels"                 guint                 : Read / Write
+  "fast"                     gboolean              : Read / Write
+  "normalize"                gboolean              : Read / Write
+  "quality"                  guint                 : Read / Write
+  "samples-per-frame"        guint                 : Read
+  "stream"                   gpointer              : Read / Write
+
+
+
+

Description

+

+

+

+ +

+
+
+

Details

+
+

OGMRipAudioCodec

+
typedef struct _OGMRipAudioCodec OGMRipAudioCodec;
+

+ +

+
+
+
+

ogmrip_audio_codec_get_dvd_audio_stream ()

+
OGMDvdAudioStream*  ogmrip_audio_codec_get_dvd_audio_stream
+                                                        (OGMRipAudioCodec *audio);
+

+Gets the audio stream to encode.

+

+ +

+
++ + + + + + + + + + +

audio :

 an OGMRipAudioCodec +

Returns :

 an OGMDvdAudioStream, or NULL +
+
+
+
+

ogmrip_audio_codec_set_dvd_audio_stream ()

+
void                ogmrip_audio_codec_set_dvd_audio_stream
+                                                        (OGMRipAudioCodec *audio,
+                                                         OGMDvdAudioStream *stream);
+

+Sets the audio stream to encode.

+

+ +

+
++ + + + + + + + + + +

audio :

 an OGMRipAudioCodec +

stream :

 an OGMDvdAudioStream +
+
+
+
+

ogmrip_audio_codec_get_channels ()

+
gint                ogmrip_audio_codec_get_channels     (OGMRipAudioCodec *audio);
+

+Gets the number of channels of the output file.

+

+ +

+
++ + + + + + + + + + +

audio :

 an OGMRipAudioCodec +

Returns :

 an OGMDvdAudioChannels, or -1 +
+
+
+
+

ogmrip_audio_codec_set_channels ()

+
void                ogmrip_audio_codec_set_channels     (OGMRipAudioCodec *audio,
+                                                         OGMDvdAudioChannels channels);
+

+Sets the number of channels of the output file.

+

+ +

+
++ + + + + + + + + + +

audio :

 an OGMRipAudioCodec +

channels :

 an OGMDvdAudioChannels +
+
+
+
+

ogmrip_audio_codec_get_fast ()

+
gboolean            ogmrip_audio_codec_get_fast         (OGMRipAudioCodec *audio);
+

+Returns whether to encode faster than realtime.

+

+ +

+
++ + + + + + + + + + +

audio :

 an OGMRipAudioCodec +

Returns :

 TRUE if fast encoding is enabled +
+
+
+
+

ogmrip_audio_codec_set_fast ()

+
void                ogmrip_audio_codec_set_fast         (OGMRipAudioCodec *audio,
+                                                         gboolean fast);
+

+Sets whether to encode faster than realtime.

+

+ +

+
++ + + + + + + + + + +

audio :

 an OGMRipAudioCodec +

fast :

 TRUE to enable fast encoding +
+
+
+
+

ogmrip_audio_codec_get_normalize ()

+
gboolean            ogmrip_audio_codec_get_normalize    (OGMRipAudioCodec *audio);
+

+Returns whether the volume of the audio stream should be normalized.

+

+ +

+
++ + + + + + + + + + +

audio :

 an OGMRipAudioCodec +

Returns :

 TRUE if normalization is enabled +
+
+
+
+

ogmrip_audio_codec_set_normalize ()

+
void                ogmrip_audio_codec_set_normalize    (OGMRipAudioCodec *audio,
+                                                         gboolean normalize);
+

+Sets whether to normalize the volume of the audio stream.

+

+ +

+
++ + + + + + + + + + +

audio :

 an OGMRipAudioCodec +

normalize :

 TRUE to enable normalization +
+
+
+
+

ogmrip_audio_codec_get_quality ()

+
gint                ogmrip_audio_codec_get_quality      (OGMRipAudioCodec *audio);
+

+Gets the quality of the encoding, 0 for lowest, 10 for best.

+

+ +

+
++ + + + + + + + + + +

audio :

 an OGMRipAudioCodec +

Returns :

 the quality, or -1 +
+
+
+
+

ogmrip_audio_codec_set_quality ()

+
void                ogmrip_audio_codec_set_quality      (OGMRipAudioCodec *audio,
+                                                         guint quality);
+

+Sets the quality of the encoding, 0 for lowest, 10 for best.

+

+ +

+
++ + + + + + + + + + +

audio :

 an OGMRipAudioCodec +

quality :

 the quality of the encoding +
+
+
+
+

ogmrip_audio_codec_get_sample_rate ()

+
gint                ogmrip_audio_codec_get_sample_rate  (OGMRipAudioCodec *audio);
+

+Gets the output sample rate.

+

+ +

+
++ + + + + + + + + + +

audio :

 an OGMRipAudioCodec +

Returns :

 the sample rate +
+
+
+
+

ogmrip_audio_codec_set_sample_rate ()

+
void                ogmrip_audio_codec_set_sample_rate  (OGMRipAudioCodec *audio,
+                                                         guint srate);
+

+Sets the output sample rate to be used.

+

+ +

+
++ + + + + + + + + + +

audio :

 an OGMRipAudioCodec +

srate :

 the sample rate +
+
+
+
+

ogmrip_audio_codec_get_samples_per_frame ()

+
gint                ogmrip_audio_codec_get_samples_per_frame
+                                                        (OGMRipAudioCodec *audio);
+

+Gets the number of samples per frame.

+

+ +

+
++ + + + + + + + + + +

audio :

 an OGMRipAudioCodec +

Returns :

 the number of samples per frame, or -1 +
+
+
+
+

Property Details

+
+

The "channels" property

+
  "channels"                 guint                 : Read / Write
+

Set channels.

+

Allowed values: <= 10

+

Default value: 1

+
+
+
+

The "fast" property

+
  "fast"                     gboolean              : Read / Write
+

Set fast.

+

Default value: FALSE

+
+
+
+

The "normalize" property

+
  "normalize"                gboolean              : Read / Write
+

Set normalize.

+

Default value: FALSE

+
+
+
+

The "quality" property

+
  "quality"                  guint                 : Read / Write
+

Set quality.

+

Allowed values: <= 10

+

Default value: 3

+
+
+
+

The "samples-per-frame" property

+
  "samples-per-frame"        guint                 : Read
+

Set samples per frame.

+

Default value: 512

+
+
+
+

The "stream" property

+
  "stream"                   gpointer              : Read / Write
+

Set audio stream.

+
+
+
+
+
+ Generated by GTK-Doc V1.10
+ + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipAudio.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipAudio.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipAudio.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipAudio.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,621 +0,0 @@ - - - - -OGMRipAudio - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

-OGMRipAudio -

-

OGMRipAudio — Base class for audio codecs

-
-
-

Synopsis

-
-
-#include <ogmrip-audio.h>
-
-
-                    OGMRipAudio;
-OGMDvdAudioStream*  ogmrip_audio_get_dvd_audio_stream   (OGMRipAudio *audio);
-void                ogmrip_audio_set_dvd_audio_stream   (OGMRipAudio *audio,
-                                                         OGMDvdAudioStream *stream);
-gint                ogmrip_audio_get_channels           (OGMRipAudio *audio);
-void                ogmrip_audio_set_channels           (OGMRipAudio *audio,
-                                                         OGMDvdAudioChannels channels);
-gboolean            ogmrip_audio_get_fast               (OGMRipAudio *audio);
-void                ogmrip_audio_set_fast               (OGMRipAudio *audio,
-                                                         gboolean fast);
-gboolean            ogmrip_audio_get_normalize          (OGMRipAudio *audio);
-void                ogmrip_audio_set_normalize          (OGMRipAudio *audio,
-                                                         gboolean normalize);
-gint                ogmrip_audio_get_quality            (OGMRipAudio *audio);
-void                ogmrip_audio_set_quality            (OGMRipAudio *audio,
-                                                         guint quality);
-gint                ogmrip_audio_get_sample_rate        (OGMRipAudio *audio);
-void                ogmrip_audio_set_sample_rate        (OGMRipAudio *audio,
-                                                         guint srate);
-gint                ogmrip_audio_get_samples_per_frame  (OGMRipAudio *audio);
-
-
-
-
-

Object Hierarchy

-
-
-  GObject
-   +----OGMJobSpawn
-         +----OGMJobContainer
-               +----OGMJobBin
-                     +----OGMRipCodec
-                           +----OGMRipAudio
-
-
-
-

Properties

-
-
-  "channels"                 guint                 : Read / Write
-  "fast"                     gboolean              : Read / Write
-  "normalize"                gboolean              : Read / Write
-  "quality"                  guint                 : Read / Write
-  "samples-per-frame"        guint                 : Read
-  "stream"                   gpointer              : Read / Write
-
-
-
-

Description

-

-

-

- -

-
-
-

Details

-
-

-OGMRipAudio

-
typedef struct _OGMRipAudio OGMRipAudio;
-

- -

-
-
-
-

-ogmrip_audio_get_dvd_audio_stream ()

-
OGMDvdAudioStream*  ogmrip_audio_get_dvd_audio_stream   (OGMRipAudio *audio);
-

-Gets the audio stream to encode.

-

- -

-
-- - - - - - - - - - -
audio : an OGMRipAudio -
Returns : an OGMDvdAudioStream, or NULL -
-
-
-
-

-ogmrip_audio_set_dvd_audio_stream ()

-
void                ogmrip_audio_set_dvd_audio_stream   (OGMRipAudio *audio,
-                                                         OGMDvdAudioStream *stream);
-

-Sets the audio stream to encode.

-

- -

-
-- - - - - - - - - - -
audio : an OGMRipAudio -
stream : an OGMDvdAudioStream -
-
-
-
-

-ogmrip_audio_get_channels ()

-
gint                ogmrip_audio_get_channels           (OGMRipAudio *audio);
-

-Gets the number of channels of the output file.

-

- -

-
-- - - - - - - - - - -
audio : an OGMRipAudio -
Returns : an OGMDvdAudioChannels, or -1 -
-
-
-
-

-ogmrip_audio_set_channels ()

-
void                ogmrip_audio_set_channels           (OGMRipAudio *audio,
-                                                         OGMDvdAudioChannels channels);
-

-Sets the number of channels of the output file.

-

- -

-
-- - - - - - - - - - -
audio : an OGMRipAudio -
channels : an OGMDvdAudioChannels -
-
-
-
-

-ogmrip_audio_get_fast ()

-
gboolean            ogmrip_audio_get_fast               (OGMRipAudio *audio);
-

-Returns whether to encode faster than realtime.

-

- -

-
-- - - - - - - - - - -
audio : an OGMRipAudio -
Returns : TRUE if fast encoding is enabled -
-
-
-
-

-ogmrip_audio_set_fast ()

-
void                ogmrip_audio_set_fast               (OGMRipAudio *audio,
-                                                         gboolean fast);
-

-Sets whether to encode faster than realtime.

-

- -

-
-- - - - - - - - - - -
audio : an OGMRipAudio -
fast : TRUE to enable fast encoding -
-
-
-
-

-ogmrip_audio_get_normalize ()

-
gboolean            ogmrip_audio_get_normalize          (OGMRipAudio *audio);
-

-Returns whether the volume of the audio stream should be normalized.

-

- -

-
-- - - - - - - - - - -
audio : an OGMRipAudio -
Returns : TRUE if normalization is enabled -
-
-
-
-

-ogmrip_audio_set_normalize ()

-
void                ogmrip_audio_set_normalize          (OGMRipAudio *audio,
-                                                         gboolean normalize);
-

-Sets whether to normalize the volume of the audio stream.

-

- -

-
-- - - - - - - - - - -
audio : an OGMRipAudio -
normalize : TRUE to enable normalization -
-
-
-
-

-ogmrip_audio_get_quality ()

-
gint                ogmrip_audio_get_quality            (OGMRipAudio *audio);
-

-Gets the quality of the encoding, 0 for lowest, 10 for best.

-

- -

-
-- - - - - - - - - - -
audio : an OGMRipAudio -
Returns : the quality, or -1 -
-
-
-
-

-ogmrip_audio_set_quality ()

-
void                ogmrip_audio_set_quality            (OGMRipAudio *audio,
-                                                         guint quality);
-

-Sets the quality of the encoding, 0 for lowest, 10 for best.

-

- -

-
-- - - - - - - - - - -
audio : an OGMRipAudio -
quality : the quality of the encoding -
-
-
-
-

-ogmrip_audio_get_sample_rate ()

-
gint                ogmrip_audio_get_sample_rate        (OGMRipAudio *audio);
-

-Gets the output sample rate.

-

- -

-
-- - - - - - - - - - -
audio : an OGMRipAudio -
Returns : the sample rate -
-
-
-
-

-ogmrip_audio_set_sample_rate ()

-
void                ogmrip_audio_set_sample_rate        (OGMRipAudio *audio,
-                                                         guint srate);
-

-Sets the output sample rate to be used.

-

- -

-
-- - - - - - - - - - -
audio : an OGMRipAudio -
srate : the sample rate -
-
-
-
-

-ogmrip_audio_get_samples_per_frame ()

-
gint                ogmrip_audio_get_samples_per_frame  (OGMRipAudio *audio);
-

-Gets the number of samples per frame.

-

- -

-
-- - - - - - - - - - -
audio : an OGMRipAudio -
Returns : the number of samples per frame, or -1 -
-
-
-
-

Property Details

-
-

-The "channels" property

-
  "channels"                 guint                 : Read / Write
-

Set channels.

-

Allowed values: <= 10

-

Default value: 1

-
-
-
-

-The "fast" property

-
  "fast"                     gboolean              : Read / Write
-

Set fast.

-

Default value: FALSE

-
-
-
-

-The "normalize" property

-
  "normalize"                gboolean              : Read / Write
-

Set normalize.

-

Default value: FALSE

-
-
-
-

-The "quality" property

-
  "quality"                  guint                 : Read / Write
-

Set quality.

-

Allowed values: <= 10

-

Default value: 3

-
-
-
-

-The "samples-per-frame" property

-
  "samples-per-frame"        guint                 : Read
-

Set samples per frame.

-

Default value: 512

-
-
-
-

-The "stream" property

-
  "stream"                   gpointer              : Read / Write
-

Set audio stream.

-
-
-
- - diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipChapters.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipChapters.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipChapters.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipChapters.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipChapters - + - + - - + + - + @@ -29,77 +29,72 @@ OGMRip Reference Manual Next -Top -  |  - Description -  |  - Object Hierarchy +Top +  |  + Description +  |  + Object Hierarchy
-

-OGMRipChapters -

-

OGMRipChapters — A codec to extract chapters information

+

OGMRipChapters

+

OGMRipChapters — A codec to extract chapters information
-

Synopsis

+

Synopsis

 
 #include <ogmrip-chapters.h>
 
-
-                    OGMRipChapters;
+                    OGMRipChapters;
 OGMJobSpawn*        ogmrip_chapters_new                 (OGMJobSpawn*        ogmrip_chapters_new                 (OGMDvdTitle *title,
                                                          const gchar *output);
 gchar*              ogmrip_chapters_get_label           (OGMRipChapters *chapters,
+>gchar*              ogmrip_chapters_get_label           (OGMRipChapters *chapters,
                                                          guint n);
-void                ogmrip_chapters_set_label           (OGMRipChapters *chapters,
+void                ogmrip_chapters_set_label           (OGMRipChapters *chapters,
                                                          guint n,
                                                          const gchar *label);
-
-

Object Hierarchy

+

Object Hierarchy

-
   GObject
    +----OGMJobSpawn
          +----OGMJobContainer
                +----OGMJobBin
-                     +----OGMRipCodec
+                     +----OGMRipCodec
                            +----OGMRipChapters
-

Description

+

Description

@@ -107,29 +102,27 @@

-

Details

+

Details

-

-OGMRipChapters

-
typedef struct _OGMRipChapters OGMRipChapters;
+

OGMRipChapters

+
typedef struct _OGMRipChapters OGMRipChapters;

-

-ogmrip_chapters_new ()

-
ogmrip_chapters_new ()

+
OGMJobSpawn*        ogmrip_chapters_new                 (OGMDvdTitle *title,
                                                          const gchar *output);

 

-Creates a new OGMRipChapters.

+Creates a new OGMRipChapters.

 

 
 

@@ -137,20 +130,20 @@
 
 
 
-title :
+
title :

  An OGMDvdTitle
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- The new OGMRipChapters
+
Returns :

+ The new OGMRipChapters
 
 
 
@@ -158,11 +151,10 @@
-

-ogmrip_chapters_get_label ()

-
ogmrip_chapters_get_label ()

+
gchar*              ogmrip_chapters_get_label           (OGMRipChapters *chapters,
+>gchar*              ogmrip_chapters_get_label           (OGMRipChapters *chapters,
                                                          guint n);

@@ -175,17 +167,17 @@
 
 
 
-chapters :
- An OGMRipChapters
+
chapters :

+ An OGMRipChapters
 
 
 
-n :
+
n :

  A chapter number
 
 
 
-Returns :
+
Returns :

  The label
 
 
@@ -194,9 +186,8 @@
-

-ogmrip_chapters_set_label ()

-
void                ogmrip_chapters_set_label           (OGMRipChapters *chapters,
+
ogmrip_chapters_set_label ()

+
void                ogmrip_chapters_set_label           (OGMRipChapters *chapters,
                                                          guint n,
@@ -212,17 +203,17 @@
 
 
 
-chapters :
- An OGMRipChapters
+
chapters :

+ An OGMRipChapters
 
 
 
-n :
+
n :

  A chapter number
 
 
 
-label :
+
label :

  A label
 
 
@@ -231,5 +222,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipCodec.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipCodec.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipCodec.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipCodec.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipCodec - + - - + + - - + + - + @@ -27,157 +27,168 @@ Up Home OGMRip Reference Manual -Next +Next -Top -  |  - Description -  |  - Object Hierarchy -  |  - Properties +Top +  |  + Description +  |  + Object Hierarchy +  |  + Properties
-

-OGMRipCodec -

-

OGMRipCodec — Base class for codecs

+

OGMRipCodec

+

OGMRipCodec — Base class for codecs
-

Synopsis

+

Synopsis

 
 #include <ogmrip-codec.h>
 
-
-                    OGMRipCodec;
+                    OGMRipCodec;
 gchar*              ogmrip_codec_get_output             (OGMRipCodec *codec);
-void                ogmrip_codec_set_output             (OGMRipCodec *codec,
+>gchar*              ogmrip_codec_get_output             (OGMRipCodec *codec);
+void                ogmrip_codec_set_output             (OGMRipCodec *codec,
                                                          const gchar *output);
 OGMDvdTitle*        ogmrip_codec_get_input              (OGMRipCodec *codec);
-void                ogmrip_codec_set_input              (OGMRipCodec *codec,
+href="/usr/share/gtk-doc/html/ogmdvd/ogmdvd-ogmdvd-types.html#OGMDvdTitle"
+>OGMDvdTitle*        ogmrip_codec_get_input              (OGMRipCodec *codec);
+void                ogmrip_codec_set_input              (OGMRipCodec *codec,
                                                          OGMDvdTitle *title);
 gdouble             ogmrip_codec_get_length             (OGMRipCodec *codec,
+>gdouble             ogmrip_codec_get_length             (OGMRipCodec *codec,
                                                          OGMDvdTime *length);
-void                ogmrip_codec_set_edl                (OGMRipCodec *codec,
-                                                         OGMRipEdl *edl);
-OGMRipEdl*          ogmrip_codec_get_edl                (OGMRipCodec *codec);
-void                ogmrip_codec_set_chapters           (OGMRipCodec *codec,
+glong               ogmrip_codec_get_frames             (OGMRipCodec *codec);
+gboolean            ogmrip_codec_get_telecine           (OGMRipCodec *codec);
+void                ogmrip_codec_set_telecine           (OGMRipCodec *codec,
+                                                         gboolean telecine);
+gboolean            ogmrip_codec_get_progressive        (OGMRipCodec *codec);
+void                ogmrip_codec_set_progressive        (OGMRipCodec *codec,
+                                                         gboolean progressive);
+void                ogmrip_codec_set_edl                (OGMRipCodec *codec,
+                                                         OGMRipEdl *edl);
+OGMRipEdl*          ogmrip_codec_get_edl                (OGMRipCodec *codec);
+void                ogmrip_codec_set_chapters           (OGMRipCodec *codec,
                                                          guint start,
                                                          gint end);
-void                ogmrip_codec_get_chapters           (OGMRipCodec *codec,
+void                ogmrip_codec_get_chapters           (OGMRipCodec *codec,
                                                          guint *start,
                                                          guint *end);
-void                ogmrip_codec_set_framerate          (OGMRipCodec *codec,
+void                ogmrip_codec_set_framerate          (OGMRipCodec *codec,
                                                          guint numerator,
                                                          guint denominator);
-void                ogmrip_codec_get_framerate          (OGMRipCodec *codec,
+void                ogmrip_codec_get_framerate          (OGMRipCodec *codec,
                                                          guint *numerator,
                                                          guint *denominator);
-void                ogmrip_codec_set_framestep          (OGMRipCodec *codec,
+void                ogmrip_codec_set_framestep          (OGMRipCodec *codec,
                                                          guint framestep);
 gint                ogmrip_codec_get_framestep          (OGMRipCodec *codec);
-void                ogmrip_codec_set_unlink_on_unref    (OGMRipCodec *codec,
+>gint                ogmrip_codec_get_framestep          (OGMRipCodec *codec);
+void                ogmrip_codec_set_unlink_on_unref    (OGMRipCodec *codec,
                                                          gboolean do_unlink);
 gboolean            ogmrip_codec_get_unlink_on_unref    (OGMRipCodec *codec);
-
+>gboolean            ogmrip_codec_get_unlink_on_unref    (OGMRipCodec *codec);
-

Object Hierarchy

+

Object Hierarchy

-
   GObject
    +----OGMJobSpawn
          +----OGMJobContainer
                +----OGMJobBin
                      +----OGMRipCodec
-                           +----OGMRipAudio
-                           +----OGMRipChapters
-                           +----OGMRipDvdCpy
-                           +----OGMRipSubp
-                           +----OGMRipVideo
+                           +----OGMRipAudioCodec
+                           +----OGMRipChapters
+                           +----OGMRipDvdCpy
+                           +----OGMRipSubpCodec
+                           +----OGMRipVideoCodec
-

Properties

+

Properties

-
-  "end-chapter"              end-chapter"              gint                  : Read / Write
-  "framestep"                framestep"                guint                 : Read / Write
-  "input"                    input"                    gpointer              : Read / Write
-  "length"                   length"                   gdouble               : Read
-  "output"                   gchararray            : Read / Write
-  "progressive"              output"                   gchar*                : Read / Write
+  "progressive"              gboolean              : Read / Write
-  "start-chapter"            start-chapter"            gint                  : Read / Write
-  "telecine"                 telecine"                 gboolean              : Read / Write
-

Description

+

Description

@@ -185,22 +196,20 @@

-

Details

+

Details

-

-OGMRipCodec

-
typedef struct _OGMRipCodec OGMRipCodec;
+

OGMRipCodec

+
typedef struct _OGMRipCodec OGMRipCodec;

-

-ogmrip_codec_get_output ()

-
ogmrip_codec_get_output ()

+
gchar*              ogmrip_codec_get_output             (OGMRipCodec *codec);

+>gchar*              ogmrip_codec_get_output             (OGMRipCodec *codec);

Gets the name of the output file.

@@ -210,12 +219,12 @@ -codec : - an OGMRipCodec +

codec :

+ an OGMRipCodec -Returns : +

Returns :

the filename, or NULL @@ -224,9 +233,8 @@
-

-ogmrip_codec_set_output ()

-
void                ogmrip_codec_set_output             (OGMRipCodec *codec,
+
ogmrip_codec_set_output ()

+
void                ogmrip_codec_set_output             (OGMRipCodec *codec,
                                                          const gchar *output);

@@ -239,12 +247,12 @@
 
 
 
-codec :
- an OGMRipCodec
+
codec :

+ an OGMRipCodec
 
 
 
-output :
+
output :

  the name of the output file
 
 
@@ -253,11 +261,10 @@
-

-ogmrip_codec_get_input ()

-
OGMDvdTitle*        ogmrip_codec_get_input              (OGMRipCodec *codec);
+

ogmrip_codec_get_input ()

+
OGMDvdTitle*        ogmrip_codec_get_input              (OGMRipCodec *codec);

Gets the input DVD title.

@@ -267,14 +274,14 @@ -codec : - an OGMRipCodec +

codec :

+ an OGMRipCodec -Returns : +

Returns :

an OGMDvdTitle, or NULL @@ -283,11 +290,10 @@
-

-ogmrip_codec_set_input ()

-
void                ogmrip_codec_set_input              (OGMRipCodec *codec,
+
ogmrip_codec_set_input ()

+
void                ogmrip_codec_set_input              (OGMRipCodec *codec,
                                                          OGMDvdTitle *title);

 

 Sets the input DVD title.

@@ -298,14 +304,14 @@
 
 
 
-codec :
- an OGMRipCodec
+
codec :

+ an OGMRipCodec
 
 
 
-title :
+
title :

  an OGMDvdTitle
 
 
@@ -314,11 +320,10 @@
-

-ogmrip_codec_get_length ()

-
ogmrip_codec_get_length ()

+
gdouble             ogmrip_codec_get_length             (OGMRipCodec *codec,
+>gdouble             ogmrip_codec_get_length             (OGMRipCodec *codec,
                                                          OGMDvdTime *length);

 

 Returns the length of the encoding in seconds. If length is not NULL, the
@@ -331,17 +336,17 @@
 
 
 
-codec :
- an OGMRipCodec
+
codec :

+ an OGMRipCodec
 
 
 
-length :
+
length :

  a pointer to store an OGMDvdTime, or NULL
 
 
 
-Returns :
+
Returns :

  the length in seconds, or -1.0
 
 
@@ -350,10 +355,154 @@
-

-ogmrip_codec_set_edl ()

-
void                ogmrip_codec_set_edl                (OGMRipCodec *codec,
-                                                         OGMRipEdl *edl);
+

ogmrip_codec_get_frames ()

+
glong               ogmrip_codec_get_frames             (OGMRipCodec *codec);
+

+Returns the length of the encoding in frames.

+

+ +

+
++ + + + + + + + + + +

codec :

 an OGMRipCodec +

Returns :

 the length in frames, or -1 +
+
+
+
+

ogmrip_codec_get_telecine ()

+
gboolean            ogmrip_codec_get_telecine           (OGMRipCodec *codec);
+

+Gets whether an inverse telecine filter will be applied

+

+ +

+
++ + + + + + + + + + +

codec :

 an OGMRipCodec +

Returns :

 TRUE if inverse telecine +
+
+
+
+

ogmrip_codec_set_telecine ()

+
void                ogmrip_codec_set_telecine           (OGMRipCodec *codec,
+                                                         gboolean telecine);
+

+Sets whether an inverse telecine filter will be applied

+

+ +

+
++ + + + + + + + + + +

codec :

 an OGMRipCodec +

telecine :

 TRUE to inverse telecine +
+
+
+
+

ogmrip_codec_get_progressive ()

+
gboolean            ogmrip_codec_get_progressive        (OGMRipCodec *codec);
+

+Gets whether an inverse progressive filter will be applied

+

+ +

+
++ + + + + + + + + + +

codec :

 an OGMRipCodec +

Returns :

 TRUE if inverse progressive +
+
+
+
+

ogmrip_codec_set_progressive ()

+
void                ogmrip_codec_set_progressive        (OGMRipCodec *codec,
+                                                         gboolean progressive);
+

+Sets whether an inverse progressive filter will be applied

+

+ +

+
++ + + + + + + + + + +

codec :

 an OGMRipCodec +

progressive :

 TRUE to inverse progressive +
+
+
+
+

ogmrip_codec_set_edl ()

+
void                ogmrip_codec_set_edl                (OGMRipCodec *codec,
+                                                         OGMRipEdl *edl);

Sets an edit decision list file.

@@ -363,13 +512,13 @@ -codec : - an OGMRipCodec +

codec :

+ an OGMRipCodec -edl : - an OGMRipEdl +

edl :

+ an OGMRipEdl @@ -377,9 +526,8 @@
-

-ogmrip_codec_get_edl ()

-
OGMRipEdl*          ogmrip_codec_get_edl                (OGMRipCodec *codec);
+

ogmrip_codec_get_edl ()

+
OGMRipEdl*          ogmrip_codec_get_edl                (OGMRipCodec *codec);

Gets the edit decision list if any.

@@ -389,13 +537,13 @@ -codec : - an OGMRipCodec +

codec :

+ an OGMRipCodec -Returns : - an OGMRipEdl, or NULL +

Returns :

+ an OGMRipEdl, or NULL @@ -403,9 +551,8 @@
-

-ogmrip_codec_set_chapters ()

-
void                ogmrip_codec_set_chapters           (OGMRipCodec *codec,
+
ogmrip_codec_set_chapters ()

+
void                ogmrip_codec_set_chapters           (OGMRipCodec *codec,
                                                          guint start,
@@ -421,17 +568,17 @@
 
 
 
-codec :
- an OGMRipCodec
+
codec :

+ an OGMRipCodec
 
 
 
-start :
+
start :

  the start chapter
 
 
 
-end :
+
end :

  the end chapter
 
 
@@ -440,9 +587,8 @@
-

-ogmrip_codec_get_chapters ()

-
void                ogmrip_codec_get_chapters           (OGMRipCodec *codec,
+
ogmrip_codec_get_chapters ()

+
void                ogmrip_codec_get_chapters           (OGMRipCodec *codec,
                                                          guint *start,
@@ -458,17 +604,17 @@
 
 
 
-codec :
- an OGMRipCodec
+
codec :

+ an OGMRipCodec
 
 
 
-start :
+
start :

  a pointer to set the start chapter
 
 
 
-end :
+
end :

  a pointer to set the end chapter
 
 
@@ -477,9 +623,8 @@
-

-ogmrip_codec_set_framerate ()

-
void                ogmrip_codec_set_framerate          (OGMRipCodec *codec,
+
ogmrip_codec_set_framerate ()

+
void                ogmrip_codec_set_framerate          (OGMRipCodec *codec,
                                                          guint numerator,
@@ -496,17 +641,17 @@
 
 
 
-codec :
- an OGMRipCodec
+
codec :

+ an OGMRipCodec
 
 
 
-numerator :
+
numerator :

  the framerate numerator
 
 
 
-denominator :
+
denominator :

  the framerate denominator
 
 
@@ -515,9 +660,8 @@
-

-ogmrip_codec_get_framerate ()

-
void                ogmrip_codec_get_framerate          (OGMRipCodec *codec,
+
ogmrip_codec_get_framerate ()

+
void                ogmrip_codec_get_framerate          (OGMRipCodec *codec,
                                                          guint *numerator,
@@ -533,17 +677,17 @@
 
 
 
-codec :
- an OGMRipCodec
+
codec :

+ an OGMRipCodec
 
 
 
-numerator :
+
numerator :

  a pointer to store the framerate numerator
 
 
 
-denominator :
+
denominator :

  a pointer to store the framerate denominator
 
 
@@ -552,9 +696,8 @@
-

-ogmrip_codec_set_framestep ()

-
void                ogmrip_codec_set_framestep          (OGMRipCodec *codec,
+
ogmrip_codec_set_framestep ()

+
void                ogmrip_codec_set_framestep          (OGMRipCodec *codec,
                                                          guint framestep);

@@ -567,12 +710,12 @@
 
 
 
-codec :
- an OGMRipCodec
+
codec :

+ an OGMRipCodec
 
 
 
-framestep :
+
framestep :

  the framestep
 
 
@@ -581,11 +724,10 @@
-

-ogmrip_codec_get_framestep ()

-
ogmrip_codec_get_framestep ()

+
gint                ogmrip_codec_get_framestep          (OGMRipCodec *codec);

+>gint                ogmrip_codec_get_framestep          (OGMRipCodec *codec);

Gets the number of frames to skip after every frame.

@@ -595,12 +737,12 @@ -codec : - an OGMRipCodec +

codec :

+ an OGMRipCodec -Returns : +

Returns :

the framestep, or -1 @@ -609,14 +751,13 @@
-

-ogmrip_codec_set_unlink_on_unref ()

-
void                ogmrip_codec_set_unlink_on_unref    (OGMRipCodec *codec,
+
ogmrip_codec_set_unlink_on_unref ()

+
void                ogmrip_codec_set_unlink_on_unref    (OGMRipCodec *codec,
                                                          gboolean do_unlink);

 

-Whether to unlink the output file on the final unref of the OGMRipCodec
+Whether to unlink the output file on the final unref of the OGMRipCodec
 data structure.

 

 
@@ -625,12 +766,12 @@
 
 
 
-codec :
- an OGMRipCodec
+
codec :

+ an OGMRipCodec
 
 
 
-do_unlink :
+
do_unlink :

  TRUE to unlink the output file
@@ -641,11 +782,10 @@
-

-ogmrip_codec_get_unlink_on_unref ()

-
ogmrip_codec_get_unlink_on_unref ()

+
gboolean            ogmrip_codec_get_unlink_on_unref    (OGMRipCodec *codec);

+>gboolean            ogmrip_codec_get_unlink_on_unref    (OGMRipCodec *codec);

Returns whether the output file will be unlinked on the final unref of codec.

@@ -656,12 +796,12 @@ -codec : - an OGMRipCodec +

codec :

+ an OGMRipCodec -Returns : +

Returns :

a boolean @@ -670,11 +810,10 @@
-

Property Details

+

Property Details

-

-The "end-chapter" property

-
  "end-chapter"              
The "end-chapter" property

+
  "end-chapter"              gint                  : Read / Write

 
Set end chapter.

@@ -683,9 +822,8 @@
-

-The "framestep" property

-
  "framestep"                
The "framestep" property

+
  "framestep"                guint                 : Read / Write

 
Set framestep.

@@ -693,18 +831,16 @@
-

-The "input" property

-
  "input"                    
The "input" property

+
  "input"                    gpointer              : Read / Write

 
Set input title.
-

-The "length" property

-
  "length"                   
The "length" property

+
  "length"                   gdouble               : Read

 
Get length.

@@ -713,19 +849,17 @@
-

-The "output" property

-
  "output"                   gchararray            : Read / Write
+

The "output" property

+
  "output"                   gchar*                : Read / Write

Set output file.

Default value: NULL

-

-The "progressive" property

-
  "progressive"              
The "progressive" property

+
  "progressive"              gboolean              : Read / Write

 
Set progressive.

@@ -733,9 +867,8 @@
-

-The "start-chapter" property

-
  "start-chapter"            
The "start-chapter" property

+
  "start-chapter"            gint                  : Read / Write

 
Set start chapter.

@@ -744,9 +877,8 @@
-

-The "telecine" property

-
  "telecine"                 
The "telecine" property

+
  "telecine"                 gboolean              : Read / Write

 
Set telecine.

@@ -754,5 +886,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipContainer.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipContainer.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipContainer.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipContainer.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipContainer - + - - - + + + - - + + - + @@ -23,40 +23,37 @@ - + - + - +
-

-OGMRipContainer -

-

OGMRipContainer — Base class for containers

+

OGMRipContainer

+

OGMRipContainer — Base class for containers
-

Synopsis

+

Synopsis

 
 #include <ogmrip-container.h>
 
-
-void                (*OGMRipContainerCodecFunc)         (OGMRipContainer *container,
-                                                         OGMRipCodec *codec,
+void                (*OGMRipContainerCodecFunc)         (OGMRipContainer *container,
+                                                         OGMRipCodec *codec,
                                                          guint demuxer,
@@ -66,123 +63,123 @@
                                                          gpointer user_data);
-void                (*OGMRipContainerFileFunc)          (OGMRipContainer *container,
-                                                         OGMRipFile *file,
+void                (*OGMRipContainerFileFunc)          (OGMRipContainer *container,
+                                                         OGMRipFile *file,
                                                          gpointer user_data);
-                    OGMRipContainer;
+                    OGMRipContainer;
 gchar*              ogmrip_container_get_output         (OGMRipContainer *container);
-void                ogmrip_container_set_output         (OGMRipContainer *container,
+>gchar*              ogmrip_container_get_output         (OGMRipContainer *container);
+void                ogmrip_container_set_output         (OGMRipContainer *container,
                                                          const gchar *output);
 gchar*              ogmrip_container_get_label          (OGMRipContainer *container);
-void                ogmrip_container_set_label          (OGMRipContainer *container,
+>gchar*              ogmrip_container_get_label          (OGMRipContainer *container);
+void                ogmrip_container_set_label          (OGMRipContainer *container,
                                                          const gchar *label);
 gchar*              ogmrip_container_get_fourcc         (OGMRipContainer *container);
-void                ogmrip_container_set_fourcc         (OGMRipContainer *container,
+>gchar*              ogmrip_container_get_fourcc         (OGMRipContainer *container);
+void                ogmrip_container_set_fourcc         (OGMRipContainer *container,
                                                          const gchar *fourcc);
-OGMRipVideo*        ogmrip_container_get_video          (OGMRipContainer *container);
-void                ogmrip_container_set_video          (OGMRipContainer *container,
-                                                         OGMRipVideo *video);
-void                ogmrip_container_add_audio          (OGMRipContainer *container,
-                                                         OGMRipAudio *audio,
-                                                         OGMRipAudioDemuxer demuxer,
+OGMRipVideoCodec*   ogmrip_container_get_video          (OGMRipContainer *container);
+void                ogmrip_container_set_video          (OGMRipContainer *container,
+                                                         OGMRipVideoCodec *video);
+void                ogmrip_container_add_audio          (OGMRipContainer *container,
+                                                         OGMRipAudioCodec *audio,
+                                                         OGMRipAudioDemuxer demuxer,
                                                          gint language);
 GSList*             ogmrip_container_get_audio          (OGMRipContainer *container);
-OGMRipAudio*        ogmrip_container_get_nth_audio      (OGMRipContainer *container,
+>GSList*             ogmrip_container_get_audio          (OGMRipContainer *container);
+OGMRipAudioCodec*   ogmrip_container_get_nth_audio      (OGMRipContainer *container,
                                                          gint n);
 gint                ogmrip_container_get_n_audio        (OGMRipContainer *container);
-void                ogmrip_container_foreach_audio      (OGMRipContainer *container,
-                                                         OGMRipContainerCodecFunc func,
+>gint                ogmrip_container_get_n_audio        (OGMRipContainer *container);
+void                ogmrip_container_foreach_audio      (OGMRipContainer *container,
+                                                         OGMRipContainerCodecFunc func,
                                                          gpointer data);
-void                ogmrip_container_add_subp           (OGMRipContainer *container,
-                                                         OGMRipSubp *subp,
-                                                         OGMRipSubpDemuxer demuxer,
+void                ogmrip_container_add_subp           (OGMRipContainer *container,
+                                                         OGMRipSubpCodec *subp,
+                                                         OGMRipSubpDemuxer demuxer,
                                                          gint language);
 GSList*             ogmrip_container_get_subp           (OGMRipContainer *container);
+>GSList*             ogmrip_container_get_subp           (OGMRipContainer *container);
 gint                ogmrip_container_get_n_subp         (OGMRipContainer *container);
-OGMRipSubp*         ogmrip_container_get_nth_subp       (OGMRipContainer *container,
+>gint                ogmrip_container_get_n_subp         (OGMRipContainer *container);
+OGMRipSubpCodec*    ogmrip_container_get_nth_subp       (OGMRipContainer *container,
                                                          gint n);
-void                ogmrip_container_foreach_subp       (OGMRipContainer *container,
-                                                         OGMRipContainerCodecFunc func,
+void                ogmrip_container_foreach_subp       (OGMRipContainer *container,
+                                                         OGMRipContainerCodecFunc func,
                                                          gpointer data);
-void                ogmrip_container_add_chapters       (OGMRipContainer *container,
-                                                         OGMRipChapters *chapters,
+void                ogmrip_container_add_chapters       (OGMRipContainer *container,
+                                                         OGMRipChapters *chapters,
                                                          gint language);
 GSList*             ogmrip_container_get_chapters       (OGMRipContainer *container);
-OGMRipChapters*     ogmrip_container_get_nth_chapters   (OGMRipContainer *container,
+>GSList*             ogmrip_container_get_chapters       (OGMRipContainer *container);
+OGMRipChapters*     ogmrip_container_get_nth_chapters   (OGMRipContainer *container,
                                                          gint n);
 gint                ogmrip_container_get_n_chapters     (OGMRipContainer *container);
-void                ogmrip_container_foreach_chapters   (OGMRipContainer *container,
-                                                         OGMRipContainerCodecFunc func,
+>gint                ogmrip_container_get_n_chapters     (OGMRipContainer *container);
+void                ogmrip_container_foreach_chapters   (OGMRipContainer *container,
+                                                         OGMRipContainerCodecFunc func,
                                                          gpointer data);
-void                ogmrip_container_add_file           (OGMRipContainer *container,
-                                                         OGMRipFile *file);
+void                ogmrip_container_add_file           (OGMRipContainer *container,
+                                                         OGMRipFile *file);
 GSList*             ogmrip_container_get_files          (OGMRipContainer *container);
-OGMRipFile*         ogmrip_container_get_nth_file       (OGMRipContainer *container,
+>GSList*             ogmrip_container_get_files          (OGMRipContainer *container);
+OGMRipFile*         ogmrip_container_get_nth_file       (OGMRipContainer *container,
                                                          gint n);
 gint                ogmrip_container_get_n_files        (OGMRipContainer *container);
-void                ogmrip_container_foreach_file       (OGMRipContainer *container,
-                                                         OGMRipContainerFileFunc func,
+>gint                ogmrip_container_get_n_files        (OGMRipContainer *container);
+void                ogmrip_container_foreach_file       (OGMRipContainer *container,
+                                                         OGMRipContainerFileFunc func,
                                                          gpointer data);
-void                ogmrip_container_set_split          (OGMRipContainer *container,
+void                ogmrip_container_set_split          (OGMRipContainer *container,
                                                          guint number,
                                                          guint size);
-void                ogmrip_container_get_split          (OGMRipContainer *container,
+void                ogmrip_container_get_split          (OGMRipContainer *container,
                                                          guint *number,
@@ -190,62 +187,69 @@
 href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"
 >guint *size);
 gint                ogmrip_container_get_start_delay    (OGMRipContainer *container);
+void                ogmrip_container_set_start_delay    (OGMRipContainer *container,
+                                                         guint start_delay);
+gint                ogmrip_container_get_overhead       (OGMRipContainer *container);
+gint64              ogmrip_container_get_overhead_size  (OGMRipContainer *container);
+>gint64              ogmrip_container_get_overhead_size  (OGMRipContainer *container);
 gint64              ogmrip_container_get_nonvideo_size  (OGMRipContainer *container);
-
+>gint64              ogmrip_container_get_nonvideo_size  (OGMRipContainer *container);
-

Object Hierarchy

+

Object Hierarchy

-
   GObject
    +----OGMJobSpawn
          +----OGMJobContainer
                +----OGMJobBin
                      +----OGMRipContainer
-

Properties

+

Properties

-
-  "fourcc"                   gchararray            : Read / Write
-  "label"                    gchararray            : Read / Write
-  "output"                   gchararray            : Read / Write
-  "overhead"                 fourcc"                   gchar*                : Read / Write
+  "label"                    gchar*                : Read / Write
+  "output"                   gchar*                : Read / Write
+  "overhead"                 guint                 : Read
-  "start-delay"              start-delay"              guint                 : Read / Write
-  "target-number"            target-number"            guint                 : Read / Write
-  "target-size"              target-size"              guint                 : Read / Write
-

Description

+

Description

@@ -253,12 +257,11 @@

-

Details

+

Details

-

-OGMRipContainerCodecFunc ()

-
void                (*OGMRipContainerCodecFunc)         (OGMRipContainer *container,
-                                                         OGMRipCodec *codec,
+
OGMRipContainerCodecFunc ()

+
void                (*OGMRipContainerCodecFunc)         (OGMRipContainer *container,
+                                                         OGMRipCodec *codec,
                                                          guint demuxer,
@@ -269,8 +272,8 @@
 href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
 >gpointer user_data);

 

-Specifies the type of functions passed to ogmrip_container_foreach_audio(),
-ogmrip_container_foreach_subp(), and ogmrip_container_foreach_chapters().

+Specifies the type of functions passed to ogmrip_container_foreach_audio(),
+ogmrip_container_foreach_subp(), and ogmrip_container_foreach_chapters().

 

 
 

@@ -278,27 +281,27 @@
 
 
 
-container :
- An OGMRipContainer
+
container :

+ An OGMRipContainer
 
 
 
-codec :
- An OGMRipCodec
+
codec :

+ An OGMRipCodec
 
 
 
-demuxer :
+
demuxer :

  The demuxer to be used
 
 
 
-language :
+
language :

  The language of the stream
 
 
 
-user_data :
+
user_data :

  The user data
 
 
@@ -307,15 +310,14 @@
-

-OGMRipContainerFileFunc ()

-
void                (*OGMRipContainerFileFunc)          (OGMRipContainer *container,
-                                                         OGMRipFile *file,
+
OGMRipContainerFileFunc ()

+
void                (*OGMRipContainerFileFunc)          (OGMRipContainer *container,
+                                                         OGMRipFile *file,
                                                          gpointer user_data);

 

-Specifies the type of functions passed to ogmrip_container_foreach_file().

+Specifies the type of functions passed to ogmrip_container_foreach_file().

 

 
 

@@ -323,17 +325,17 @@
 
 
 
-container :
- An OGMRipContainer
+
container :

+ An OGMRipContainer
 
 
 
-file :
- An OGMRipFile
+
file :

+ An OGMRipFile
 
 
 
-user_data :
+
user_data :

  The user data
 
 
@@ -342,20 +344,18 @@
-

-OGMRipContainer

-
typedef struct _OGMRipContainer OGMRipContainer;
+

OGMRipContainer

+
typedef struct _OGMRipContainer OGMRipContainer;

-

-ogmrip_container_get_output ()

-
ogmrip_container_get_output ()

+
gchar*              ogmrip_container_get_output         (OGMRipContainer *container);

+>gchar*              ogmrip_container_get_output         (OGMRipContainer *container);

Gets the name of the output file.

@@ -365,12 +365,12 @@ -container : - An OGMRipContainer +

container :

+ An OGMRipContainer -Returns : +

Returns :

The filename, or NULL @@ -379,9 +379,8 @@
-

-ogmrip_container_set_output ()

-
void                ogmrip_container_set_output         (OGMRipContainer *container,
+
ogmrip_container_set_output ()

+
void                ogmrip_container_set_output         (OGMRipContainer *container,
                                                          const gchar *output);

@@ -394,12 +393,12 @@
 
 
 
-container :
- an OGMRipContainer
+
container :

+ an OGMRipContainer
 
 
 
-output :
+
output :

  the name of the output file
 
 
@@ -408,11 +407,10 @@
-

-ogmrip_container_get_label ()

-
ogmrip_container_get_label ()

+
gchar*              ogmrip_container_get_label          (OGMRipContainer *container);

+>gchar*              ogmrip_container_get_label          (OGMRipContainer *container);

Gets the label of the rip.

@@ -422,12 +420,12 @@ -container : - An OGMRipContainer +

container :

+ An OGMRipContainer -Returns : +

Returns :

The label, or NULL @@ -436,9 +434,8 @@
-

-ogmrip_container_set_label ()

-
void                ogmrip_container_set_label          (OGMRipContainer *container,
+
ogmrip_container_set_label ()

+
void                ogmrip_container_set_label          (OGMRipContainer *container,
                                                          const gchar *label);

@@ -451,12 +448,12 @@
 
 
 
-container :
- An OGMRipContainer
+
container :

+ An OGMRipContainer
 
 
 
-label :
+
label :

  the label
 
 
@@ -465,11 +462,10 @@
-

-ogmrip_container_get_fourcc ()

-
ogmrip_container_get_fourcc ()

+
gchar*              ogmrip_container_get_fourcc         (OGMRipContainer *container);

+>gchar*              ogmrip_container_get_fourcc         (OGMRipContainer *container);

Gets the FourCC of the rip.

@@ -479,12 +475,12 @@ -container : - An OGMRipContainer +

container :

+ An OGMRipContainer -Returns : +

Returns :

The FourCC, or NULL @@ -493,9 +489,8 @@
-

-ogmrip_container_set_fourcc ()

-
void                ogmrip_container_set_fourcc         (OGMRipContainer *container,
+
ogmrip_container_set_fourcc ()

+
void                ogmrip_container_set_fourcc         (OGMRipContainer *container,
                                                          const gchar *fourcc);

@@ -508,12 +503,12 @@
 
 
 
-container :
- An OGMRipContainer
+
container :

+ An OGMRipContainer
 
 
 
-fourcc :
+
fourcc :

  the FourCC
 
 
@@ -522,9 +517,8 @@
-

-ogmrip_container_get_video ()

-
OGMRipVideo*        ogmrip_container_get_video          (OGMRipContainer *container);
+

ogmrip_container_get_video ()

+
OGMRipVideoCodec*   ogmrip_container_get_video          (OGMRipContainer *container);

Gets the video codec of the rip.

@@ -534,13 +528,13 @@ -container : - An OGMRipContainer +

container :

+ An OGMRipContainer -Returns : - An OGMRipVideo, or NULL +

Returns :

+ An OGMRipVideoCodec, or NULL @@ -548,10 +542,9 @@
-

-ogmrip_container_set_video ()

-
void                ogmrip_container_set_video          (OGMRipContainer *container,
-                                                         OGMRipVideo *video);
+

ogmrip_container_set_video ()

+
void                ogmrip_container_set_video          (OGMRipContainer *container,
+                                                         OGMRipVideoCodec *video);

Sets the video codec of the rip.

@@ -561,13 +554,13 @@ -container : - An OGMRipContainer +

container :

+ An OGMRipContainer -video : - An OGMRipVideo +

video :

+ An OGMRipVideoCodec @@ -575,11 +568,10 @@
-

-ogmrip_container_add_audio ()

-
void                ogmrip_container_add_audio          (OGMRipContainer *container,
-                                                         OGMRipAudio *audio,
-                                                         OGMRipAudioDemuxer demuxer,
+
ogmrip_container_add_audio ()

+
void                ogmrip_container_add_audio          (OGMRipContainer *container,
+                                                         OGMRipAudioCodec *audio,
+                                                         OGMRipAudioDemuxer demuxer,
                                                          gint language);

@@ -592,22 +584,22 @@
 
 
 
-container :
- An OGMRipContainer
+
container :

+ An OGMRipContainer
 
 
 
-audio :
- An OGMRipAudio
+
audio :

+ An OGMRipAudioCodec
 
 
 
-demuxer :
+
demuxer :

  The demuxer to be used
 
 
 
-language :
+
language :

  The language of the stream
 
 
@@ -616,11 +608,10 @@
-

-ogmrip_container_get_audio ()

-
ogmrip_container_get_audio ()

+
GSList*             ogmrip_container_get_audio          (OGMRipContainer *container);

+>GSList*             ogmrip_container_get_audio          (OGMRipContainer *container);

Gets a list of the audio codecs of the rip.

@@ -630,12 +621,12 @@ -container : - An OGMRipContainer +

container :

+ An OGMRipContainer -Returns : +

Returns :

A GSList, or NULL @@ -646,9 +637,8 @@
-

-ogmrip_container_get_nth_audio ()

-
OGMRipAudio*        ogmrip_container_get_nth_audio      (OGMRipContainer *container,
+
ogmrip_container_get_nth_audio ()

+
OGMRipAudioCodec*   ogmrip_container_get_nth_audio      (OGMRipContainer *container,
                                                          gint n);

@@ -661,18 +651,18 @@
 
 
 
-container :
- an OGMRipContainer
+
container :

+ an OGMRipContainer
 
 
 
-n :
+
n :

  The index of the audio codec
 
 
 
-Returns :
- An OGMRipAudio, or NULL
+
Returns :

+ An OGMRipAudioCodec, or NULL
 
 
 
@@ -680,11 +670,10 @@
-

-ogmrip_container_get_n_audio ()

-
ogmrip_container_get_n_audio ()

+
gint                ogmrip_container_get_n_audio        (OGMRipContainer *container);

+>gint                ogmrip_container_get_n_audio        (OGMRipContainer *container);

Gets the number of audio codecs.

@@ -694,12 +683,12 @@ -container : - an OGMRipContainer +

container :

+ an OGMRipContainer -Returns : +

Returns :

the number of audio codecs @@ -708,10 +697,9 @@
-

-ogmrip_container_foreach_audio ()

-
void                ogmrip_container_foreach_audio      (OGMRipContainer *container,
-                                                         OGMRipContainerCodecFunc func,
+
ogmrip_container_foreach_audio ()

+
void                ogmrip_container_foreach_audio      (OGMRipContainer *container,
+                                                         OGMRipContainerCodecFunc func,
                                                          gpointer data);

@@ -724,17 +712,17 @@
 
 
 
-container :
- an OGMRipContainer
+
container :

+ an OGMRipContainer
 
 
 
-func :
+
func :

  The function to call with each audio codec
 
 
 
-data :
+
data :

  User data to pass to the function
 
 
@@ -743,11 +731,10 @@
-

-ogmrip_container_add_subp ()

-
void                ogmrip_container_add_subp           (OGMRipContainer *container,
-                                                         OGMRipSubp *subp,
-                                                         OGMRipSubpDemuxer demuxer,
+
ogmrip_container_add_subp ()

+
void                ogmrip_container_add_subp           (OGMRipContainer *container,
+                                                         OGMRipSubpCodec *subp,
+                                                         OGMRipSubpDemuxer demuxer,
                                                          gint language);

@@ -760,22 +747,22 @@
 
 
 
-container :
- An OGMRipContainer
+
container :

+ An OGMRipContainer
 
 
 
-subp :
- An OGMRipSubp
+
subp :

+ An OGMRipSubpCodec
 
 
 
-demuxer :
+
demuxer :

  The demuxer to be used
 
 
 
-language :
+
language :

  The language of the stream
 
 
@@ -784,11 +771,10 @@
-

-ogmrip_container_get_subp ()

-
ogmrip_container_get_subp ()

+
GSList*             ogmrip_container_get_subp           (OGMRipContainer *container);

+>GSList*             ogmrip_container_get_subp           (OGMRipContainer *container);

Gets a list of the subtitle codecs of the rip.

@@ -798,12 +784,12 @@ -container : - An OGMRipContainer +

container :

+ An OGMRipContainer -Returns : +

Returns :

A GSList, or NULL @@ -814,11 +800,10 @@
-

-ogmrip_container_get_n_subp ()

-
ogmrip_container_get_n_subp ()

+
gint                ogmrip_container_get_n_subp         (OGMRipContainer *container);

+>gint                ogmrip_container_get_n_subp         (OGMRipContainer *container);

Gets the number of subtitle codecs.

@@ -828,12 +813,12 @@ -container : - an OGMRipContainer +

container :

+ an OGMRipContainer -Returns : +

Returns :

the number of subtitle codecs @@ -842,9 +827,8 @@
-

-ogmrip_container_get_nth_subp ()

-
OGMRipSubp*         ogmrip_container_get_nth_subp       (OGMRipContainer *container,
+
ogmrip_container_get_nth_subp ()

+
OGMRipSubpCodec*    ogmrip_container_get_nth_subp       (OGMRipContainer *container,
                                                          gint n);

@@ -857,18 +841,18 @@
 
 
 
-container :
- an OGMRipContainer
+
container :

+ an OGMRipContainer
 
 
 
-n :
+
n :

  The index of the subtitle codec
 
 
 
-Returns :
- An OGMRipSubp, or NULL
+
Returns :

+ An OGMRipSubpCodec, or NULL
 
 
 
@@ -876,10 +860,9 @@
-

-ogmrip_container_foreach_subp ()

-
void                ogmrip_container_foreach_subp       (OGMRipContainer *container,
-                                                         OGMRipContainerCodecFunc func,
+
ogmrip_container_foreach_subp ()

+
void                ogmrip_container_foreach_subp       (OGMRipContainer *container,
+                                                         OGMRipContainerCodecFunc func,
                                                          gpointer data);

@@ -892,17 +875,17 @@
 
 
 
-container :
- An OGMRipContainer
+
container :

+ An OGMRipContainer
 
 
 
-func :
+
func :

  The function to call with each subtitle codec
 
 
 
-data :
+
data :

  User data to pass to the function
 
 
@@ -911,10 +894,9 @@
-

-ogmrip_container_add_chapters ()

-
void                ogmrip_container_add_chapters       (OGMRipContainer *container,
-                                                         OGMRipChapters *chapters,
+
ogmrip_container_add_chapters ()

+
void                ogmrip_container_add_chapters       (OGMRipContainer *container,
+                                                         OGMRipChapters *chapters,
                                                          gint language);

@@ -927,17 +909,17 @@
 
 
 
-container :
- An OGMRipContainer
+
container :

+ An OGMRipContainer
 
 
 
-chapters :
- An OGMRipChapters
+
chapters :

+ An OGMRipChapters
 
 
 
-language :
+
language :

  The language of the chapters
 
 
@@ -946,11 +928,10 @@
-

-ogmrip_container_get_chapters ()

-
ogmrip_container_get_chapters ()

+
GSList*             ogmrip_container_get_chapters       (OGMRipContainer *container);

+>GSList*             ogmrip_container_get_chapters       (OGMRipContainer *container);

Gets a list of the chapters codecs of the rip.

@@ -960,12 +941,12 @@ -container : - An OGMRipContainer +

container :

+ An OGMRipContainer -Returns : +

Returns :

A GSList, or NULL @@ -976,9 +957,8 @@
-

-ogmrip_container_get_nth_chapters ()

-
OGMRipChapters*     ogmrip_container_get_nth_chapters   (OGMRipContainer *container,
+
ogmrip_container_get_nth_chapters ()

+
OGMRipChapters*     ogmrip_container_get_nth_chapters   (OGMRipContainer *container,
                                                          gint n);

@@ -991,18 +971,18 @@
 
 
 
-container :
- an OGMRipContainer
+
container :

+ an OGMRipContainer
 
 
 
-n :
+
n :

  The index of the chapters codec
 
 
 
-Returns :
- An OGMRipChapters, or NULL
+
Returns :

+ An OGMRipChapters, or NULL
 
 
 
@@ -1010,11 +990,10 @@
-

-ogmrip_container_get_n_chapters ()

-
ogmrip_container_get_n_chapters ()

+
gint                ogmrip_container_get_n_chapters     (OGMRipContainer *container);

+>gint                ogmrip_container_get_n_chapters     (OGMRipContainer *container);

Gets the number of chapters codecs.

@@ -1024,12 +1003,12 @@ -container : - an OGMRipContainer +

container :

+ an OGMRipContainer -Returns : +

Returns :

the number of chapters codecs @@ -1038,10 +1017,9 @@
-

-ogmrip_container_foreach_chapters ()

-
void                ogmrip_container_foreach_chapters   (OGMRipContainer *container,
-                                                         OGMRipContainerCodecFunc func,
+
ogmrip_container_foreach_chapters ()

+
void                ogmrip_container_foreach_chapters   (OGMRipContainer *container,
+                                                         OGMRipContainerCodecFunc func,
                                                          gpointer data);

@@ -1054,17 +1032,17 @@
 
 
 
-container :
- An OGMRipContainer
+
container :

+ An OGMRipContainer
 
 
 
-func :
+
func :

  The function to call with each chapters codec
 
 
 
-data :
+
data :

  User data to pass to the function
 
 
@@ -1073,10 +1051,9 @@
-

-ogmrip_container_add_file ()

-
void                ogmrip_container_add_file           (OGMRipContainer *container,
-                                                         OGMRipFile *file);
+

ogmrip_container_add_file ()

+
void                ogmrip_container_add_file           (OGMRipContainer *container,
+                                                         OGMRipFile *file);

Adds a file to the rip.

@@ -1086,12 +1063,12 @@ -container : - An OGMRipContainer +

container :

+ An OGMRipContainer -file : +

file :

An OOGMRipFile @@ -1100,11 +1077,10 @@
-

-ogmrip_container_get_files ()

-
ogmrip_container_get_files ()

+
GSList*             ogmrip_container_get_files          (OGMRipContainer *container);

+>GSList*             ogmrip_container_get_files          (OGMRipContainer *container);

Gets a list of the files of the rip.

@@ -1114,12 +1090,12 @@ -container : - An OGMRipContainer +

container :

+ An OGMRipContainer -Returns : +

Returns :

A GSList, or NULL @@ -1130,9 +1106,8 @@
-

-ogmrip_container_get_nth_file ()

-
OGMRipFile*         ogmrip_container_get_nth_file       (OGMRipContainer *container,
+
ogmrip_container_get_nth_file ()

+
OGMRipFile*         ogmrip_container_get_nth_file       (OGMRipContainer *container,
                                                          gint n);

@@ -1145,18 +1120,18 @@
 
 
 
-container :
- an OGMRipContainer
+
container :

+ an OGMRipContainer
 
 
 
-n :
+
n :

  The index of the file
 
 
 
-Returns :
- An OGMRipFile, or NULL
+
Returns :

+ An OGMRipFile, or NULL
 
 
 
@@ -1164,11 +1139,10 @@
-

-ogmrip_container_get_n_files ()

-
ogmrip_container_get_n_files ()

+
gint                ogmrip_container_get_n_files        (OGMRipContainer *container);

+>gint                ogmrip_container_get_n_files        (OGMRipContainer *container);

Gets the number of files.

@@ -1178,12 +1152,12 @@ -container : - an OGMRipContainer +

container :

+ an OGMRipContainer -Returns : +

Returns :

the number of files @@ -1192,10 +1166,9 @@
-

-ogmrip_container_foreach_file ()

-
void                ogmrip_container_foreach_file       (OGMRipContainer *container,
-                                                         OGMRipContainerFileFunc func,
+
ogmrip_container_foreach_file ()

+
void                ogmrip_container_foreach_file       (OGMRipContainer *container,
+                                                         OGMRipContainerFileFunc func,
                                                          gpointer data);

@@ -1208,17 +1181,17 @@
 
 
 
-container :
- An OGMRipContainer
+
container :

+ An OGMRipContainer
 
 
 
-func :
+
func :

  The function to call with each file
 
 
 
-data :
+
data :

  User data to pass to the function
 
 
@@ -1227,9 +1200,8 @@
-

-ogmrip_container_set_split ()

-
void                ogmrip_container_set_split          (OGMRipContainer *container,
+
ogmrip_container_set_split ()

+
void                ogmrip_container_set_split          (OGMRipContainer *container,
                                                          guint number,
@@ -1245,17 +1217,17 @@
 
 
 
-container :
- An OGMRipContainer
+
container :

+ An OGMRipContainer
 
 
 
-number :
+
number :

   The number of file
 
 
 
-size :
+
size :

  The size of each file
 
 
@@ -1264,9 +1236,8 @@
-

-ogmrip_container_get_split ()

-
void                ogmrip_container_get_split          (OGMRipContainer *container,
+
ogmrip_container_get_split ()

+
void                ogmrip_container_get_split          (OGMRipContainer *container,
                                                          guint *number,
@@ -1282,17 +1253,17 @@
 
 
 
-container :
- An OGMRipContainer
+
container :

+ An OGMRipContainer
 
 
 
-number :
+
number :

   A pointer to store the number of file
 
 
 
-size :
+
size :

  A pointer to store the size of each file
 
 
@@ -1301,11 +1272,92 @@
-

-ogmrip_container_get_overhead_size ()

-
ogmrip_container_get_start_delay ()

+
gint                ogmrip_container_get_start_delay    (OGMRipContainer *container);

+

+Gets the start delay of the audio tracks.

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+


container :
 An OGMRipContainer
+
Returns :
 The start delay, or -1
+

+
+
+
+

ogmrip_container_set_start_delay ()

+
void                ogmrip_container_set_start_delay    (OGMRipContainer *container,
+                                                         guint start_delay);
+

+Sets the start delay of the audio tracks

+

+ +

+
++ + + + + + + + + + +

container :

 An OGMRipContainer +

start_delay :

 the start delay +
+
+
+
+

ogmrip_container_get_overhead ()

+
gint                ogmrip_container_get_overhead       (OGMRipContainer *container);
+

+Gets the overhead of the container.

+

+ +

+
++ + + + + + + + + + +

container :

 An OGMRipContainer +

Returns :

 The overhead, or -1 +
+
+
+
+

ogmrip_container_get_overhead_size ()

+
gint64              ogmrip_container_get_overhead_size  (OGMRipContainer *container);
+>gint64 ogmrip_container_get_overhead_size (OGMRipContainer *container);

Returns the size of the overhead generated by the video, audio and subtitle stream, the chapters information and the files in bytes.

@@ -1316,12 +1368,12 @@ -container : - An OGMRipContainer +

container :

+ An OGMRipContainer -Returns : +

Returns :

The overhead size @@ -1330,11 +1382,10 @@
-

-ogmrip_container_get_nonvideo_size ()

-
ogmrip_container_get_nonvideo_size ()

+
gint64              ogmrip_container_get_nonvideo_size  (OGMRipContainer *container);

+>gint64              ogmrip_container_get_nonvideo_size  (OGMRipContainer *container);

Returns the size of the audio and subtitle streams, the chapters information and the files in bytes.

@@ -1345,12 +1396,12 @@ -container : - An OGMRipContainer +

container :

+ An OGMRipContainer -Returns : +

Returns :

The nonvideo size @@ -1359,41 +1410,37 @@
-

Property Details

+

Property Details

-

-The "fourcc" property

-
  "fourcc"                   gchararray            : Read / Write
+

The "fourcc" property

+
  "fourcc"                   gchar*                : Read / Write

Set fourcc.

Default value: NULL

-

-The "label" property

-
  "label"                    gchararray            : Read / Write
+

The "label" property

+
  "label"                    gchar*                : Read / Write

Set label.

Default value: NULL

-

-The "output" property

-
  "output"                   gchararray            : Read / Write
+

The "output" property

+
  "output"                   gchar*                : Read / Write

Set output file.

Default value: NULL

-

-The "overhead" property

-
  "overhead"                 
The "overhead" property

+
  "overhead"                 guint                 : Read

 
Get overhead.

@@ -1401,9 +1448,8 @@
-

-The "start-delay" property

-
  "start-delay"              
The "start-delay" property

+
  "start-delay"              guint                 : Read / Write

 
Set start delay.

@@ -1412,9 +1458,8 @@
-

-The "target-number" property

-
  "target-number"            
The "target-number" property

+
  "target-number"            guint                 : Read / Write

 
Set target number.

@@ -1422,9 +1467,8 @@
-

-The "target-size" property

-
  "target-size"              
The "target-size" property

+
  "target-size"              guint                 : Read / Write

 
Set target size.

@@ -1432,5 +1476,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip.devhelp /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip.devhelp --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip.devhelp 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip.devhelp 2008-09-28 19:28:17.000000000 +0200 @@ -9,14 +9,16 @@ + - - - + + + + @@ -31,7 +33,7 @@ - + @@ -50,13 +52,13 @@ + + + + - - - - @@ -67,10 +69,10 @@ - - - - + + + + @@ -84,6 +86,7 @@ + @@ -93,6 +96,7 @@ + @@ -100,6 +104,7 @@ + @@ -108,6 +113,7 @@ + @@ -124,8 +130,7 @@ - - + @@ -137,7 +142,8 @@ - + + @@ -165,14 +171,31 @@ + + + + + + + + + + + + + + + + + @@ -191,92 +214,107 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -310,6 +348,9 @@ + + + @@ -319,6 +360,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -333,15 +408,8 @@ - - - - - - - - - + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip.devhelp2 /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip.devhelp2 --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip.devhelp2 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip.devhelp2 2008-09-28 19:28:17.000000000 +0200 @@ -9,14 +9,16 @@ + - - - + + + + @@ -31,7 +33,7 @@ - + @@ -50,13 +52,13 @@ + + + + - - - - @@ -67,10 +69,10 @@ - - - - + + + + @@ -84,6 +86,7 @@ + @@ -93,6 +96,7 @@ + @@ -100,6 +104,7 @@ + @@ -108,6 +113,7 @@ + @@ -124,8 +130,7 @@ - - + @@ -137,7 +142,8 @@ - + + @@ -165,14 +171,31 @@ + + + + + + + + + + + + + + + + + @@ -191,92 +214,107 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -310,6 +348,9 @@ + + + @@ -319,6 +360,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -333,15 +408,8 @@ - - - - - - - - - + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipDvdCpy.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipDvdCpy.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipDvdCpy.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipDvdCpy.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipDvdcpy - + - - + + - - + + - + @@ -29,64 +29,59 @@ OGMRip Reference Manual Next -Top -  |  - Description -  |  - Object Hierarchy +Top +  |  + Description +  |  + Object Hierarchy
-

-OGMRipDvdcpy -

-

OGMRipDvdcpy — A codec to copy a DVD title

+

OGMRipDvdcpy

+

OGMRipDvdcpy — A codec to copy a DVD title
-

Synopsis

+

Synopsis

 
 #include <ogmrip-dvdcpy.h>
 
-
-                    OGMRipDvdCpy;
+                    OGMRipDvdCpy;
 OGMJobSpawn*        ogmrip_dvdcpy_new                   (OGMJobSpawn*        ogmrip_dvdcpy_new                   (OGMDvdTitle *title,
                                                          const gchar *output);
-
-

Object Hierarchy

+

Object Hierarchy

-
   GObject
    +----OGMJobSpawn
          +----OGMJobContainer
                +----OGMJobBin
-                     +----OGMRipCodec
+                     +----OGMRipCodec
                            +----OGMRipDvdCpy
-

Description

+

Description

@@ -94,23 +89,21 @@

-

Details

+

Details

-

-OGMRipDvdCpy

-
typedef struct _OGMRipDvdCpy OGMRipDvdCpy;
+

OGMRipDvdCpy

+
typedef struct _OGMRipDvdCpy OGMRipDvdCpy;

-

-ogmrip_dvdcpy_new ()

-
ogmrip_dvdcpy_new ()

+
OGMJobSpawn*        ogmrip_dvdcpy_new                   (OGMDvdTitle *title,
                                                          const 
 
 
-title :
+
title :

  An OGMDvdTitle
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
+
Returns :

  The new OGMRipDvdcpy
 
 
@@ -145,5 +138,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipAac.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipAac.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipAac.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipAac.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipAac - + - + - - + + - + @@ -29,54 +29,45 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-OGMRipAac -

-

OGMRipAac — An audio codec to encode in AAC

+

OGMRipAac

+

OGMRipAac — An audio codec to encode in AAC
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipAac;
+                    OGMRipAac;
 OGMJobSpawn*        ogmrip_aac_new                      (OGMJobSpawn*        ogmrip_aac_new                      (OGMDvdAudioStream *audio,
                                                          const gchar *output);
-
-

Description

+

Description

-

Details

+

Details

-

-OGMRipAac

-
typedef struct {
-  OGMRipAudio parent_instance;
-
-  OGMRipAacPriv *priv;
+
OGMRipAac

+
typedef struct {
+  OGMRipAudioCodec parent_instance;
 } OGMRipAac;
 

 

@@ -85,18 +76,17 @@
-

-ogmrip_aac_new ()

-
ogmrip_aac_new ()

+
OGMJobSpawn*        ogmrip_aac_new                      (OGMDvdAudioStream *audio,
                                                          const gchar *output);

 

-Creates a new OGMRipAac.

+Creates a new OGMRipAac.

 

 
 

@@ -104,20 +94,20 @@
 
 
 
-audio :
+
audio :

  An OGMDvdAudioStream
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- The new OGMRipAac
+
Returns :

+ The new OGMRipAac
 
 
 
@@ -125,5 +115,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipAudioCopy.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipAudioCopy.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipAudioCopy.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipAudioCopy.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipAudioCopy - + - + - - + + - + @@ -29,54 +29,45 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-OGMRipAudioCopy -

-

OGMRipAudioCopy — A codec to copy an audio stream

+

OGMRipAudioCopy

+

OGMRipAudioCopy — A codec to copy an audio stream
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipAudioCopy;
+                    OGMRipAudioCopy;
 OGMJobSpawn*        ogmrip_audio_copy_new               (OGMJobSpawn*        ogmrip_audio_copy_new               (OGMDvdAudioStream *audio,
                                                          const gchar *output);
-
-

Description

+

Description

-

Details

+

Details

-

-OGMRipAudioCopy

-
typedef struct {
-  OGMRipAudio parent_instance;
-
-  OGMRipAudioCopyPriv *priv;
+
OGMRipAudioCopy

+
typedef struct {
+  OGMRipAudioCodec parent_instance;
 } OGMRipAudioCopy;
 

 

@@ -85,18 +76,17 @@
-

-ogmrip_audio_copy_new ()

-
ogmrip_audio_copy_new ()

+
OGMJobSpawn*        ogmrip_audio_copy_new               (OGMDvdAudioStream *audio,
                                                          const gchar *output);

 

-Creates a new OGMRipAudioCopy.

+Creates a new OGMRipAudioCopy.

 

 
 

@@ -104,20 +94,20 @@
 
 
 
-audio :
+
audio :

  An OGMDvdAudioStream
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- The new OGMRipAudioCopy
+
Returns :

+ The new OGMRipAudioCopy
 
 
 
@@ -125,5 +115,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipAvi.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipAvi.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipAvi.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipAvi.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipAvi - + - + - - + + - + @@ -29,51 +29,42 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-OGMRipAvi -

-

OGMRipAvi — The AVI container

+

OGMRipAvi

+

OGMRipAvi — The AVI container
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipAvi;
+                    OGMRipAvi;
 OGMJobSpawn*        ogmrip_avi_new                      (const OGMJobSpawn*        ogmrip_avi_new                      (const gchar *output);
-
-

Description

+

Description

-

Details

+

Details

-

-OGMRipAvi

-
typedef struct {
+
OGMRipAvi

+
typedef struct {
   OGMRipContainer parent_instance;
-
-  OGMRipAviPriv *priv;
 } OGMRipAvi;
 

 

@@ -82,15 +73,14 @@
-

-ogmrip_avi_new ()

-
ogmrip_avi_new ()

+
OGMJobSpawn*        ogmrip_avi_new                      (const gchar *output);

 

-Creates a new OGMRipAvi.

+Creates a new OGMRipAvi.

 

 
 

@@ -98,13 +88,13 @@
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- The new OGMRipAvi
+
Returns :

+ The new OGMRipAvi
 
 
 
@@ -112,5 +102,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-ogmrip-edl.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-ogmrip-edl.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-ogmrip-edl.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-ogmrip-edl.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + Edit Decision List - + - + - + - - + + - + @@ -29,30 +29,27 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-Edit Decision List -

-

Edit Decision List — Functions for manipulating EDL

+

Edit Decision List

+

Edit Decision List — Functions for manipulating EDL
-

Synopsis

+

Synopsis

 
 #include <ogmrip-edl.h>
 
-
-enum                OGMRipEdlAction;
-void                (*OGMRipEdlFunc)                    (OGMRipEdlAction action,
+enum                OGMRipEdlAction;
+void                (*OGMRipEdlFunc)                    (OGMRipEdlAction action,
                                                          gdouble start,
@@ -62,35 +59,35 @@
                                                          gpointer data);
-                    OGMRipEdl;
-OGMRipEdl*          ogmrip_edl_new                      (const OGMRipEdl;
+OGMRipEdl*          ogmrip_edl_new                      (const gchar *filename);
-void                ogmrip_edl_ref                      (OGMRipEdl *edl);
-void                ogmrip_edl_unref                    (OGMRipEdl *edl);
+void                ogmrip_edl_ref                      (OGMRipEdl *edl);
+void                ogmrip_edl_unref                    (OGMRipEdl *edl);
 gchar*              ogmrip_edl_get_filename             (OGMRipEdl *edl);
-void                ogmrip_edl_add                      (OGMRipEdl *edl,
-                                                         OGMRipEdlAction action,
+>gchar*              ogmrip_edl_get_filename             (OGMRipEdl *edl);
+void                ogmrip_edl_add                      (OGMRipEdl *edl,
+                                                         OGMRipEdlAction action,
                                                          gdouble start,
                                                          gdouble end);
-void                ogmrip_edl_foreach                  (OGMRipEdl *edl,
-                                                         OGMRipEdlFunc func,
+void                ogmrip_edl_foreach                  (OGMRipEdl *edl,
+                                                         OGMRipEdlFunc func,
                                                          gpointer data);
 gboolean            ogmrip_edl_dump                     (OGMRipEdl *edl);
+>gboolean            ogmrip_edl_dump                     (OGMRipEdl *edl);
-

Description

+

Description

@@ -98,11 +95,10 @@

-

Details

+

Details

-

-enum OGMRipEdlAction

-
typedef enum
+
enum OGMRipEdlAction

+
typedef enum
 {
   OGMRIP_EDL_ACTION_SKIP,
   OGMRIP_EDL_ACTION_MUTE
@@ -117,12 +113,12 @@
 
 
 
-OGMRIP_EDL_ACTION_SKIP
+
OGMRIP_EDL_ACTION_SKIP

  The skip action
 
 
 
-OGMRIP_EDL_ACTION_MUTE
+
OGMRIP_EDL_ACTION_MUTE

  The mute action
 
 
@@ -131,9 +127,8 @@
-

-OGMRipEdlFunc ()

-
void                (*OGMRipEdlFunc)                    (OGMRipEdlAction action,
+
OGMRipEdlFunc ()

+
void                (*OGMRipEdlFunc)                    (OGMRipEdlAction action,
                                                          gdouble start,
@@ -144,7 +139,7 @@
 href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
 >gpointer data);

 

-Specifies the type of functions passed to ogmrip_edl_foreach().

+Specifies the type of functions passed to ogmrip_edl_foreach().

 

 
 

@@ -152,22 +147,22 @@
 
 
 
-action :
- an OGMRipEdlAction
+
action :

+ an OGMRipEdlAction
 
 
 
-start :
+
start :

  the start in seconds
 
 
 
-end :
+
end :

  the end in seconds
 
 
 
-data :
+
data :

  the user data
 
 
@@ -176,22 +171,20 @@
-

-OGMRipEdl

-
typedef struct _OGMRipEdl OGMRipEdl;
+

OGMRipEdl

+
typedef struct _OGMRipEdl OGMRipEdl;

-

-ogmrip_edl_new ()

-
OGMRipEdl*          ogmrip_edl_new                      (const 
ogmrip_edl_new ()

+
OGMRipEdl*          ogmrip_edl_new                      (const gchar *filename);

 

-Creates a new OGMRipEdl.

+Creates a new OGMRipEdl.

 

 
 

@@ -199,13 +192,13 @@
 
 
 
-filename :
+
filename :

  The output file
 
 
 
-Returns :
- The new OGMRipEdl
+
Returns :

+ The new OGMRipEdl
 
 
 
@@ -213,49 +206,46 @@
-

-ogmrip_edl_ref ()

-
void                ogmrip_edl_ref                      (OGMRipEdl *edl);
+

ogmrip_edl_ref ()

+
void                ogmrip_edl_ref                      (OGMRipEdl *edl);

-Increments the reference count of the OGMRipEdl.

+Increments the reference count of the OGMRipEdl.

- - +
edl : A OGMRipEdl +

edl :

 A OGMRipEdl
-

-ogmrip_edl_unref ()

-
void                ogmrip_edl_unref                    (OGMRipEdl *edl);
+

ogmrip_edl_unref ()

+
void                ogmrip_edl_unref                    (OGMRipEdl *edl);

-Decrements the reference count of the OGMRipEdl and frees if the result is 0.

+Decrements the reference count of the OGMRipEdl and frees if the result is 0.

- - +
edl : A OGMRipEdl +

edl :

 A OGMRipEdl
-

-ogmrip_edl_get_filename ()

-
ogmrip_edl_get_filename ()

+
gchar*              ogmrip_edl_get_filename             (OGMRipEdl *edl);

+>gchar*              ogmrip_edl_get_filename             (OGMRipEdl *edl);

Gets the filename of the EDL.

@@ -265,12 +255,12 @@ -edl : - An OGMRipEdl +

edl :

+ An OGMRipEdl -Returns : +

Returns :

The filename @@ -279,10 +269,9 @@
-

-ogmrip_edl_add ()

-
void                ogmrip_edl_add                      (OGMRipEdl *edl,
-                                                         OGMRipEdlAction action,
+
ogmrip_edl_add ()

+
void                ogmrip_edl_add                      (OGMRipEdl *edl,
+                                                         OGMRipEdlAction action,
                                                          gdouble start,
@@ -298,22 +287,22 @@
 
 
 
-edl :
- An OGMRipEdl
+
edl :

+ An OGMRipEdl
 
 
 
-action :
- An OGMRipEdlAction
+
action :

+ An OGMRipEdlAction
 
 
 
-start :
+
start :

  The start in seconds
 
 
 
-end :
+
end :

  The end in seconds
 
 
@@ -322,10 +311,9 @@
-

-ogmrip_edl_foreach ()

-
void                ogmrip_edl_foreach                  (OGMRipEdl *edl,
-                                                         OGMRipEdlFunc func,
+
ogmrip_edl_foreach ()

+
void                ogmrip_edl_foreach                  (OGMRipEdl *edl,
+                                                         OGMRipEdlFunc func,
                                                          gpointer data);

@@ -338,17 +326,17 @@
 
 
 
-edl :
- An OGMRipEdl
+
edl :

+ An OGMRipEdl
 
 
 
-func :
- An OGMRipEdlFunc
+
func :

+ An OGMRipEdlFunc
 
 
 
-data :
+
data :

  The user data
 
 
@@ -357,11 +345,10 @@
-

-ogmrip_edl_dump ()

-
ogmrip_edl_dump ()

+
gboolean            ogmrip_edl_dump                     (OGMRipEdl *edl);

+>gboolean            ogmrip_edl_dump                     (OGMRipEdl *edl);

Writes the EDL in the given file.

@@ -371,12 +358,12 @@ -edl : - An OGMRipEdl +

edl :

+ An OGMRipEdl -Returns : +

Returns :

TRUE if the EDL has been dumped @@ -387,5 +374,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-ogmrip-enums.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-ogmrip-enums.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-ogmrip-enums.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-ogmrip-enums.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + Enumerations - + - + - + - - + + - + @@ -29,50 +29,46 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-Enumerations -

-

Enumerations — Public enumerated types used throughout OGMRip

+

Enumerations

+

Enumerations — Public enumerated types used throughout OGMRip
-

Synopsis

+

Synopsis

-
-
-
-enum                OGMRipFormatType;
-enum                OGMRipScalerType;
-enum                OGMRipDeintType;
-enum                OGMRipQualityType;
-enum                OGMRipCharset;
-enum                OGMRipEolStyle;
-enum                OGMRipAudioDemuxer;
-enum                OGMRipSubpDemuxer;
+enum                OGMRipFormatType;
+enum                OGMRipScalerType;
+enum                OGMRipDeintType;
+enum                OGMRipQualityType;
+enum                OGMRipCharset;
+enum                OGMRipEolStyle;
+enum                OGMRipAudioDemuxer;
+enum                OGMRipSubpDemuxer;
-

Description

+

Description

-

Details

+

Details

-

-enum OGMRipFormatType

-
typedef enum
+
enum OGMRipFormatType

+
typedef enum
 {
+  OGMRIP_FORMAT_MPEG1,
+  OGMRIP_FORMAT_MPEG2,
   OGMRIP_FORMAT_MPEG4,
   OGMRIP_FORMAT_H264,
   OGMRIP_FORMAT_THEORA,
@@ -109,127 +105,137 @@
 
 
 
-OGMRIP_FORMAT_MPEG4
+
OGMRIP_FORMAT_MPEG1

+ The Mpeg-1 video format
+
+
+
+
OGMRIP_FORMAT_MPEG2

+ The Mpeg-2 video format
+
+
+
+
OGMRIP_FORMAT_MPEG4

  The Mpeg-4 video format
 
 
 
-OGMRIP_FORMAT_H264
+
OGMRIP_FORMAT_H264

  The H264 video format
 
 
 
-OGMRIP_FORMAT_THEORA
+
OGMRIP_FORMAT_THEORA

  The Ogg Theora video format
 
 
 
-OGMRIP_FORMAT_PCM
+
OGMRIP_FORMAT_PCM

  The PCM audio format
 
 
 
-OGMRIP_FORMAT_MP3
+
OGMRIP_FORMAT_MP3

  The MP3 audio format
 
 
 
-OGMRIP_FORMAT_AC3
+
OGMRIP_FORMAT_AC3

  The AC3 audio format
 
 
 
-OGMRIP_FORMAT_DTS
+
OGMRIP_FORMAT_DTS

  The DTS audio format
 
 
 
-OGMRIP_FORMAT_AAC
+
OGMRIP_FORMAT_AAC

  The AAC audio format
 
 
 
-OGMRIP_FORMAT_VORBIS
+
OGMRIP_FORMAT_VORBIS

  The Ogg Vorbis audio format
 
 
 
-OGMRIP_FORMAT_MICRODVD
+
OGMRIP_FORMAT_MICRODVD

  The MicroDVD subtitle format
 
 
 
-OGMRIP_FORMAT_SUBRIP
+
OGMRIP_FORMAT_SUBRIP

  The SubRip subtitle format
 
 
 
-OGMRIP_FORMAT_SRT
+
OGMRIP_FORMAT_SRT

  The SRT subtitle format
 
 
 
-OGMRIP_FORMAT_SAMI
+
OGMRIP_FORMAT_SAMI

  The SAMI subtitle format
 
 
 
-OGMRIP_FORMAT_VPLAYER
+
OGMRIP_FORMAT_VPLAYER

  The VPlayer subtitle format
 
 
 
-OGMRIP_FORMAT_RT
+
OGMRIP_FORMAT_RT

  The RT subtitle format
 
 
 
-OGMRIP_FORMAT_SSA
+
OGMRIP_FORMAT_SSA

  The SSA subtitle format
 
 
 
-OGMRIP_FORMAT_PJS
+
OGMRIP_FORMAT_PJS

  The RJS subtitle format
 
 
 
-OGMRIP_FORMAT_MPSUB
+
OGMRIP_FORMAT_MPSUB

  The Mplayer subtitle format
 
 
 
-OGMRIP_FORMAT_AQT
+
OGMRIP_FORMAT_AQT

  The AQT subtitle format
 
 
 
-OGMRIP_FORMAT_SRT_2_0
+
OGMRIP_FORMAT_SRT_2_0

  The SRT version 2 subtitle format
 
 
 
-OGMRIP_FORMAT_SUBRIP_0_9
+
OGMRIP_FORMAT_SUBRIP_0_9

  The SubRip version 0.9 subtitle format
 
 
 
-OGMRIP_FORMAT_JACOSUB
+
OGMRIP_FORMAT_JACOSUB

  The JacoSub subtitle format
 
 
 
-OGMRIP_FORMAT_MPL_2
+
OGMRIP_FORMAT_MPL_2

  The MPlayer version subtitle format
 
 
 
-OGMRIP_FORMAT_VOBSUB
+
OGMRIP_FORMAT_VOBSUB

  The VobSub subtitle format
 
 
 
-OGMRIP_FORMAT_COPY
+
OGMRIP_FORMAT_COPY

  A format for internal use only
 
 
@@ -238,9 +244,8 @@
-

-enum OGMRipScalerType

-
typedef enum
+
enum OGMRipScalerType

+
typedef enum
 {
   OGMRIP_SCALER_FAST_BILINEAR,
   OGMRIP_SCALER_BILINEAR,
@@ -264,57 +269,57 @@
 
 
 
-OGMRIP_SCALER_FAST_BILINEAR
+
OGMRIP_SCALER_FAST_BILINEAR

  Fast bilinear
 
 
 
-OGMRIP_SCALER_BILINEAR
+
OGMRIP_SCALER_BILINEAR

  Bilinear
 
 
 
-OGMRIP_SCALER_BICUBIC
+
OGMRIP_SCALER_BICUBIC

  Bicubic (good quality)
 
 
 
-OGMRIP_SCALER_EXPERIMENTAL
+
OGMRIP_SCALER_EXPERIMENTAL

  Experimental
 
 
 
-OGMRIP_SCALER_NEAREST_NEIGHBOUR
+
OGMRIP_SCALER_NEAREST_NEIGHBOUR

  Nearest neighbour (bad quality)
 
 
 
-OGMRIP_SCALER_AREA
+
OGMRIP_SCALER_AREA

  Area
 
 
 
-OGMRIP_SCALER_LUMA_BICUBIC_CHROMA_BILINEAR
+
OGMRIP_SCALER_LUMA_BICUBIC_CHROMA_BILINEAR

  Luma bicubic / Chroma bilinear
 
 
 
-OGMRIP_SCALER_GAUSS
+
OGMRIP_SCALER_GAUSS

  Gauss (best for downscaling)
 
 
 
-OGMRIP_SCALER_SINCR
+
OGMRIP_SCALER_SINCR

  SincR
 
 
 
-OGMRIP_SCALER_LANCZOS
+
OGMRIP_SCALER_LANCZOS

  Lanczos
 
 
 
-OGMRIP_SCALER_BICUBIC_SPLINE
+
OGMRIP_SCALER_BICUBIC_SPLINE

  Natural bicubic spline
 
 
@@ -323,9 +328,8 @@
-

-enum OGMRipDeintType

-
typedef enum
+
enum OGMRipDeintType

+
typedef enum
 {
   OGMRIP_DEINT_NONE,
   OGMRIP_DEINT_LINEAR_BLEND,
@@ -347,47 +351,47 @@
 
 
 
-OGMRIP_DEINT_NONE
+
OGMRIP_DEINT_NONE

  No deinterlacing
 
 
 
-OGMRIP_DEINT_LINEAR_BLEND
+
OGMRIP_DEINT_LINEAR_BLEND

  Linear blend
 
 
 
-OGMRIP_DEINT_LINEAR_INTERPOLATING
+
OGMRIP_DEINT_LINEAR_INTERPOLATING

  Linear interpolating
 
 
 
-OGMRIP_DEINT_CUBIC_INTERPOLATING
+
OGMRIP_DEINT_CUBIC_INTERPOLATING

  Cubic interpolating
 
 
 
-OGMRIP_DEINT_MEDIAN
+
OGMRIP_DEINT_MEDIAN

  Median
 
 
 
-OGMRIP_DEINT_FFMPEG
+
OGMRIP_DEINT_FFMPEG

  FFMpeg
 
 
 
-OGMRIP_DEINT_LOWPASS
+
OGMRIP_DEINT_LOWPASS

  Lowpass
 
 
 
-OGMRIP_DEINT_KERNEL
+
OGMRIP_DEINT_KERNEL

  Kernel
 
 
 
-OGMRIP_DEINT_YADIF
+
OGMRIP_DEINT_YADIF

  Yadif (best)
 
 
@@ -396,13 +400,12 @@
-

-enum OGMRipQualityType

-
typedef enum
+
enum OGMRipQualityType

+
typedef enum
 {
-  OGMRIP_QUALITY_VERY_HIGH,
+  OGMRIP_QUALITY_EXTREME,
   OGMRIP_QUALITY_HIGH,
-  OGMRIP_QUALITY_FAST
+  OGMRIP_QUALITY_NORMAL
 } OGMRipQualityType;
 

 

@@ -414,18 +417,18 @@
 
 
 
-OGMRIP_QUALITY_VERY_HIGH
- Very high quality
+
OGMRIP_QUALITY_EXTREME

+ Extreme quality
 
 
 
-OGMRIP_QUALITY_HIGH
+
OGMRIP_QUALITY_HIGH

  High quality
 
 
 
-OGMRIP_QUALITY_FAST
- Low quality
+
OGMRIP_QUALITY_NORMAL

+ Normal quality
 
 
 
@@ -433,9 +436,8 @@
-

-enum OGMRipCharset

-
typedef enum
+
enum OGMRipCharset

+
typedef enum
 {
   OGMRIP_CHARSET_UTF8,
   OGMRIP_CHARSET_ISO8859_1,
@@ -451,17 +453,17 @@
 
 
 
-OGMRIP_CHARSET_UTF8
+
OGMRIP_CHARSET_UTF8

  UTF-8 charset
 
 
 
-OGMRIP_CHARSET_ISO8859_1
+
OGMRIP_CHARSET_ISO8859_1

  ISO8859-1 charset
 
 
 
-OGMRIP_CHARSET_ASCII
+
OGMRIP_CHARSET_ASCII

  ASCII
 
 
@@ -470,9 +472,8 @@
-

-enum OGMRipEolStyle

-
typedef enum
+
enum OGMRipEolStyle

+
typedef enum
 {
   OGMRIP_EOL_CR,
   OGMRIP_EOL_CR_LF
@@ -487,12 +488,12 @@
 
 
 
-OGMRIP_EOL_CR
+
OGMRIP_EOL_CR

  Carriage return only
 
 
 
-OGMRIP_EOL_CR_LF
+
OGMRIP_EOL_CR_LF

  Carriage return + line feed
 
 
@@ -501,9 +502,8 @@
-

-enum OGMRipAudioDemuxer

-
typedef enum
+
enum OGMRipAudioDemuxer

+
typedef enum
 {
   OGMRIP_AUDIO_DEMUXER_AUTO = 0,
   OGMRIP_AUDIO_DEMUXER_AC3  = 0x2000,
@@ -519,17 +519,17 @@
 
 
 
-OGMRIP_AUDIO_DEMUXER_AUTO
+
OGMRIP_AUDIO_DEMUXER_AUTO

  The demuxer is autodetected
 
 
 
-OGMRIP_AUDIO_DEMUXER_AC3
+
OGMRIP_AUDIO_DEMUXER_AC3

  The AC3 demuxer must be used
 
 
 
-OGMRIP_AUDIO_DEMUXER_DTS
+
OGMRIP_AUDIO_DEMUXER_DTS

  The DTS demuxer must be used
 
 
@@ -538,9 +538,8 @@
-

-enum OGMRipSubpDemuxer

-
typedef enum
+
enum OGMRipSubpDemuxer

+
typedef enum
 {
   OGMRIP_SUBP_DEMUXER_AUTO,
   OGMRIP_SUBP_DEMUXER_VOBSUB
@@ -555,12 +554,12 @@
 
 
 
-OGMRIP_SUBP_DEMUXER_AUTO
+
OGMRIP_SUBP_DEMUXER_AUTO

  The demuxer is autodetected
 
 
 
-OGMRIP_SUBP_DEMUXER_VOBSUB
+
OGMRIP_SUBP_DEMUXER_VOBSUB

  The VobSub demuxer must be used
 
 
@@ -569,5 +568,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipFile.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipFile.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipFile.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipFile.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + Files - + - + - - + + - - + + - + @@ -27,59 +27,56 @@ Up Home OGMRip Reference Manual -Next +Next -Top -  |  - Description +Top +  |  + Description
-

-Files -

-

Files — Structures to manipulate media files

+

Files

+

Files — Structures to manipulate media files
-

Synopsis

+

Synopsis

 
 #include <ogmrip-file.h>
 
-
-                    OGMRipFile;
-                    OGMRipVideoFile;
-                    OGMRipAudioFile;
-                    OGMRipSubpFile;
-enum                OGMRipFileType;
-enum                OGMRipFileError;
-#define             OGMRIP_FILE_ERROR
-void                ogmrip_file_ref                     (OGMRipFile *file);
-void                ogmrip_file_unref                   (OGMRipFile *file);
+                    OGMRipFile;
+                    OGMRipVideoFile;
+                    OGMRipAudioFile;
+                    OGMRipSubpFile;
+enum                OGMRipFileType;
+enum                OGMRipFileError;
+#define             OGMRIP_FILE_ERROR
+void                ogmrip_file_ref                     (OGMRipFile *file);
+void                ogmrip_file_unref                   (OGMRipFile *file);
 gint                ogmrip_file_get_type                (OGMRipFile *file);
+>gint                ogmrip_file_get_type                (OGMRipFile *file);
 gint                ogmrip_file_get_format              (OGMRipFile *file);
+>gint                ogmrip_file_get_format              (OGMRipFile *file);
 gint64              ogmrip_file_get_size                (OGMRipFile *file);
+>gint64              ogmrip_file_get_size                (OGMRipFile *file);
 gchar*              ogmrip_file_get_filename            (OGMRipFile *file);
-void                ogmrip_file_set_language            (OGMRipFile *file,
+>gchar*              ogmrip_file_get_filename            (OGMRipFile *file);
+void                ogmrip_file_set_language            (OGMRipFile *file,
                                                          gint lang);
 gint                ogmrip_file_get_language            (OGMRipFile *file);
-OGMRipFile*         ogmrip_video_file_new               (const gint                ogmrip_file_get_language            (OGMRipFile *file);
+OGMRipFile*         ogmrip_video_file_new               (const gchar *filename,
                                                          GError **error);
 gint                ogmrip_video_file_get_bitrate       (OGMRipVideoFile *video);
+>gint                ogmrip_video_file_get_bitrate       (OGMRipVideoFile *video);
 gdouble             ogmrip_video_file_get_length        (OGMRipVideoFile *video);
-void                ogmrip_video_file_get_size          (OGMRipVideoFile *video,
+>gdouble             ogmrip_video_file_get_length        (OGMRipVideoFile *video);
+void                ogmrip_video_file_get_size          (OGMRipVideoFile *video,
                                                          guint *width,
@@ -100,11 +97,11 @@
 >guint *height);
 gdouble             ogmrip_video_file_get_framerate     (OGMRipVideoFile *video);
+>gdouble             ogmrip_video_file_get_framerate     (OGMRipVideoFile *video);
 gdouble             ogmrip_video_file_get_aspect_ratio  (OGMRipVideoFile *video);
-OGMRipFile*         ogmrip_audio_file_new               (const gdouble             ogmrip_video_file_get_aspect_ratio  (OGMRipVideoFile *video);
+OGMRipFile*         ogmrip_audio_file_new               (const gchar *filename,
                                                          GError **error);
 gint                ogmrip_audio_file_get_bitrate       (OGMRipAudioFile *audio);
+>gint                ogmrip_audio_file_get_bitrate       (OGMRipAudioFile *audio);
 gdouble             ogmrip_audio_file_get_length        (OGMRipAudioFile *audio);
+>gdouble             ogmrip_audio_file_get_length        (OGMRipAudioFile *audio);
+gint                ogmrip_audio_file_get_sample_rate   (OGMRipAudioFile *audio);
 gint                ogmrip_audio_file_get_sample_rate   (OGMRipAudioFile *audio);
+>gint                ogmrip_audio_file_get_samples_per_frame
+                                                        (OGMRipAudioFile *audio);
 gint                ogmrip_audio_file_get_samples_per_frame
-                                                        (OGMRipAudioFile *audio);
-OGMRipFile*         ogmrip_subp_file_new                (const gint                ogmrip_audio_file_get_channels      (OGMRipAudioFile *audio);
+OGMRipFile*         ogmrip_subp_file_new                (const gchar *filename,
                                                          GError **error);
 gint                ogmrip_subp_file_get_charset        (OGMRipSubpFile *subp);
-
+>gint                ogmrip_subp_file_get_charset        (OGMRipSubpFile *subp);
-

Description

+

Description

@@ -144,47 +143,42 @@

-

Details

+

Details

-

-OGMRipFile

-
typedef struct _OGMRipFile OGMRipFile;
+

OGMRipFile

+
typedef struct _OGMRipFile OGMRipFile;

-

-OGMRipVideoFile

-
typedef struct _OGMRipVideoFile OGMRipVideoFile;
+

OGMRipVideoFile

+
typedef struct _OGMRipVideoFile OGMRipVideoFile;

-

-OGMRipAudioFile

-
typedef struct _OGMRipAudioFile OGMRipAudioFile;
+

OGMRipAudioFile

+
typedef struct _OGMRipAudioFile OGMRipAudioFile;

-

-OGMRipSubpFile

-
typedef struct _OGMRipSubpFile OGMRipSubpFile;
+

OGMRipSubpFile

+
typedef struct _OGMRipSubpFile OGMRipSubpFile;

-

-enum OGMRipFileType

-
typedef enum
+
enum OGMRipFileType

+
typedef enum
 {
   OGMRIP_FILE_TYPE_VIDEO,
   OGMRIP_FILE_TYPE_AUDIO,
@@ -200,17 +194,17 @@
 
 
 
-OGMRIP_FILE_TYPE_VIDEO
+
OGMRIP_FILE_TYPE_VIDEO

  The file contains a video stream
 
 
 
-OGMRIP_FILE_TYPE_AUDIO
+
OGMRIP_FILE_TYPE_AUDIO

  The file contains an audio stream
 
 
 
-OGMRIP_FILE_TYPE_SUBP
+
OGMRIP_FILE_TYPE_SUBP

  The file contains a subtitle stream
 
 
@@ -219,9 +213,8 @@
-

-enum OGMRipFileError

-
typedef enum
+
enum OGMRipFileError

+
typedef enum
 {
   OGMRIP_FILE_ERROR_UNKNOWN,
   OGMRIP_FILE_ERROR_RANGE,
@@ -236,7 +229,7 @@
 } OGMRipFileError;
 

 

-Error codes returned by OGMRipFile functions.

+Error codes returned by OGMRipFile functions.

 

 
 

@@ -244,52 +237,52 @@
 
 
 
-OGMRIP_FILE_ERROR_UNKNOWN
+
OGMRIP_FILE_ERROR_UNKNOWN

  Unknown error
 
 
 
-OGMRIP_FILE_ERROR_RANGE
+
OGMRIP_FILE_ERROR_RANGE

  Range error
 
 
 
-OGMRIP_FILE_ERROR_BITRATE
+
OGMRIP_FILE_ERROR_BITRATE

  Impossible to get bitrate
 
 
 
-OGMRIP_FILE_ERROR_RATE
+
OGMRIP_FILE_ERROR_RATE

  Impossible to get rate
 
 
 
-OGMRIP_FILE_ERROR_LENGTH
+
OGMRIP_FILE_ERROR_LENGTH

  Impossible to get length
 
 
 
-OGMRIP_FILE_ERROR_FORMAT
+
OGMRIP_FILE_ERROR_FORMAT

  Impossible to get format
 
 
 
-OGMRIP_FILE_ERROR_WIDTH
+
OGMRIP_FILE_ERROR_WIDTH

  Impossible to get width
 
 
 
-OGMRIP_FILE_ERROR_HEIGHT
+
OGMRIP_FILE_ERROR_HEIGHT

  Impossible to get height
 
 
 
-OGMRIP_FILE_ERROR_ASPECT
+
OGMRIP_FILE_ERROR_ASPECT

  Impossible to get aspect
 
 
 
-OGMRIP_FILE_ERROR_FPS
+
OGMRIP_FILE_ERROR_FPS

  Impossible to get fps
 
 
@@ -298,13 +291,12 @@
-

-OGMRIP_FILE_ERROR

-
#define OGMRIP_FILE_ERROR ogmrip_file_error_quark ()
+
OGMRIP_FILE_ERROR

+
#define OGMRIP_FILE_ERROR ogmrip_file_error_quark ()
 

 

 Error domain for file operations. Errors in this domain will be from the
-OGMRipFileError enumeration. See OGMRipFileError enumeration. See GError for information on error domains.

 

@@ -313,49 +305,46 @@
-

-ogmrip_file_ref ()

-
void                ogmrip_file_ref                     (OGMRipFile *file);
+

ogmrip_file_ref ()

+
void                ogmrip_file_ref                     (OGMRipFile *file);

-Increments the reference count of an OGMRipFile.

+Increments the reference count of an OGMRipFile.

- - +
file : an OGMRipFile +

file :

 an OGMRipFile
-

-ogmrip_file_unref ()

-
void                ogmrip_file_unref                   (OGMRipFile *file);
+

ogmrip_file_unref ()

+
void                ogmrip_file_unref                   (OGMRipFile *file);

-Decrements the reference count of an OGMRipFile.

+Decrements the reference count of an OGMRipFile.

- - +
file : an OGMRipFile +

file :

 an OGMRipFile
-

-ogmrip_file_get_type ()

-
ogmrip_file_get_type ()

+
gint                ogmrip_file_get_type                (OGMRipFile *file);

+>gint                ogmrip_file_get_type                (OGMRipFile *file);

Gets the type of a file.

@@ -365,13 +354,13 @@ -file : - An OGMRipFile +

file :

+ An OGMRipFile -Returns : - An OGMRipFileType, or -1 +

Returns :

+ An OGMRipFileType, or -1 @@ -379,11 +368,10 @@
-

-ogmrip_file_get_format ()

-
ogmrip_file_get_format ()

+
gint                ogmrip_file_get_format              (OGMRipFile *file);

+>gint                ogmrip_file_get_format              (OGMRipFile *file);

Gets the format of a file.

@@ -393,13 +381,13 @@ -file : - An OGMRipFile +

file :

+ An OGMRipFile -Returns : - An OGMRipFormatType, or -1 +

Returns :

+ An OGMRipFormatType, or -1 @@ -407,11 +395,10 @@
-

-ogmrip_file_get_size ()

-
ogmrip_file_get_size ()

+
gint64              ogmrip_file_get_size                (OGMRipFile *file);

+>gint64              ogmrip_file_get_size                (OGMRipFile *file);

Gets the size of a file in bytes.

@@ -421,12 +408,12 @@ -file : - An OGMRipFile +

file :

+ An OGMRipFile -Returns : +

Returns :

The file size, or -1 @@ -435,11 +422,10 @@
-

-ogmrip_file_get_filename ()

-
ogmrip_file_get_filename ()

+
gchar*              ogmrip_file_get_filename            (OGMRipFile *file);

+>gchar*              ogmrip_file_get_filename            (OGMRipFile *file);

Gets the filename of a file.

@@ -449,12 +435,12 @@ -file : - An OGMRipFile +

file :

+ An OGMRipFile -Returns : +

Returns :

The filename, or NULL @@ -463,9 +449,8 @@
-

-ogmrip_file_set_language ()

-
void                ogmrip_file_set_language            (OGMRipFile *file,
+
ogmrip_file_set_language ()

+
void                ogmrip_file_set_language            (OGMRipFile *file,
                                                          gint lang);

@@ -478,12 +463,12 @@
 
 
 
-file :
- An OGMRipFile
+
file :

+ An OGMRipFile
 
 
 
-lang :
+
lang :

  A language code
 
 
@@ -492,11 +477,10 @@
-

-ogmrip_file_get_language ()

-
ogmrip_file_get_language ()

+
gint                ogmrip_file_get_language            (OGMRipFile *file);

+>gint                ogmrip_file_get_language            (OGMRipFile *file);

Gets the language of a file.

@@ -506,12 +490,12 @@ -file : - An OGMRipFile +

file :

+ An OGMRipFile -Returns : +

Returns :

A language code, or -1 @@ -520,16 +504,15 @@
-

-ogmrip_video_file_new ()

-
OGMRipFile*         ogmrip_video_file_new               (const 
ogmrip_video_file_new ()

+
OGMRipFile*         ogmrip_video_file_new               (const gchar *filename,
                                                          GError **error);

 

-Creates a new OGMRipVideoFile from a video file.

+Creates a new OGMRipVideoFile from a video file.

 

 
 

@@ -537,18 +520,18 @@
 
 
 
-filename :
+
filename :

  A filename
 
 
 
-error :
- A location to return an error of type OGMRIP_FILE_ERROR
+
error :

+ A location to return an error of type OGMRIP_FILE_ERROR
 
 
 
-Returns :
- The new OGMRipVideoFile
+
Returns :

+ The new OGMRipVideoFile
 
 
 
@@ -556,11 +539,10 @@
-

-ogmrip_video_file_get_bitrate ()

-
ogmrip_video_file_get_bitrate ()

+
gint                ogmrip_video_file_get_bitrate       (OGMRipVideoFile *video);

+>gint                ogmrip_video_file_get_bitrate       (OGMRipVideoFile *video);

Gets the bitrate of a video file.

@@ -570,12 +552,12 @@ -video : - An OGMRipVideoFile +

video :

+ An OGMRipVideoFile -Returns : +

Returns :

The bitrate, or -1 @@ -584,11 +566,10 @@
-

-ogmrip_video_file_get_length ()

-
ogmrip_video_file_get_length ()

+
gdouble             ogmrip_video_file_get_length        (OGMRipVideoFile *video);

+>gdouble             ogmrip_video_file_get_length        (OGMRipVideoFile *video);

Gets the length in seconds of a video file.

@@ -598,12 +579,12 @@ -video : - An OGMRipVideoFile +

video :

+ An OGMRipVideoFile -Returns : +

Returns :

The length, or -1.0 @@ -612,9 +593,8 @@
-

-ogmrip_video_file_get_size ()

-
void                ogmrip_video_file_get_size          (OGMRipVideoFile *video,
+
ogmrip_video_file_get_size ()

+
void                ogmrip_video_file_get_size          (OGMRipVideoFile *video,
                                                          guint *width,
@@ -630,17 +610,17 @@
 
 
 
-video :
- An OGMRipVideoFile
+
video :

+ An OGMRipVideoFile
 
 
 
-width :
+
width :

  A pointer to store the width, or NULL
 
 
 
-height :
+
height :

  A pointer to store the height, or NULL
 
 
@@ -649,11 +629,10 @@
-

-ogmrip_video_file_get_framerate ()

-
ogmrip_video_file_get_framerate ()

+
gdouble             ogmrip_video_file_get_framerate     (OGMRipVideoFile *video);

+>gdouble             ogmrip_video_file_get_framerate     (OGMRipVideoFile *video);

Gets the framerate of a video file.

@@ -663,12 +642,12 @@ -video : - An OGMRipVideoFile +

video :

+ An OGMRipVideoFile -Returns : +

Returns :

The framerate, or -1 @@ -677,11 +656,10 @@
-

-ogmrip_video_file_get_aspect_ratio ()

-
ogmrip_video_file_get_aspect_ratio ()

+
gdouble             ogmrip_video_file_get_aspect_ratio  (OGMRipVideoFile *video);

+>gdouble             ogmrip_video_file_get_aspect_ratio  (OGMRipVideoFile *video);

Gets the aspect ratio of a video file.

@@ -691,12 +669,12 @@ -video : - An OGMRipVideoFile +

video :

+ An OGMRipVideoFile -Returns : +

Returns :

The aspect ratio, or -1 @@ -705,16 +683,15 @@
-

-ogmrip_audio_file_new ()

-
OGMRipFile*         ogmrip_audio_file_new               (const 
ogmrip_audio_file_new ()

+
OGMRipFile*         ogmrip_audio_file_new               (const gchar *filename,
                                                          GError **error);

 

-Creates a new OGMRipAudioFile from au audio file.

+Creates a new OGMRipAudioFile from au audio file.

 

 
 

@@ -722,18 +699,18 @@
 
 
 
-filename :
+
filename :

  A filename
 
 
 
-error :
- A location to return an error of type OGMRIP_FILE_ERROR
+
error :

+ A location to return an error of type OGMRIP_FILE_ERROR
 
 
 
-Returns :
- The new OGMRipAudioFile
+
Returns :

+ The new OGMRipAudioFile
 
 
 
@@ -741,11 +718,10 @@
-

-ogmrip_audio_file_get_bitrate ()

-
ogmrip_audio_file_get_bitrate ()

+
gint                ogmrip_audio_file_get_bitrate       (OGMRipAudioFile *audio);

+>gint                ogmrip_audio_file_get_bitrate       (OGMRipAudioFile *audio);

Gets the bitrate of an audio file.

@@ -755,12 +731,12 @@ -audio : - An OGMRipAudioFile +

audio :

+ An OGMRipAudioFile -Returns : +

Returns :

The bitrate, or -1 @@ -769,11 +745,10 @@
-

-ogmrip_audio_file_get_length ()

-
ogmrip_audio_file_get_length ()

+
gdouble             ogmrip_audio_file_get_length        (OGMRipAudioFile *audio);

+>gdouble             ogmrip_audio_file_get_length        (OGMRipAudioFile *audio);

Gets the length in seconds of an audio file.

@@ -783,12 +758,12 @@ -audio : - An OGMRipAudioFile +

audio :

+ An OGMRipAudioFile -Returns : +

Returns :

The length, or -1.0 @@ -797,11 +772,10 @@
-

-ogmrip_audio_file_get_sample_rate ()

-
ogmrip_audio_file_get_sample_rate ()

+
gint                ogmrip_audio_file_get_sample_rate   (OGMRipAudioFile *audio);

+>gint                ogmrip_audio_file_get_sample_rate   (OGMRipAudioFile *audio);

Gets the sample rate of an audio file.

@@ -811,12 +785,12 @@ -audio : - An OGMRipAudioFile +

audio :

+ An OGMRipAudioFile -Returns : +

Returns :

The sample rate, or -1 @@ -825,12 +799,11 @@
-

-ogmrip_audio_file_get_samples_per_frame ()

-
ogmrip_audio_file_get_samples_per_frame ()

+
gint                ogmrip_audio_file_get_samples_per_frame
-                                                        (OGMRipAudioFile *audio);

+                                                        (OGMRipAudioFile *audio);

Gets the number of samples per frame of an audio file.

@@ -840,12 +813,12 @@ -audio : - An OGMRipAudioFile +

audio :

+ An OGMRipAudioFile -Returns : +

Returns :

The number of samples per frame, or -1 @@ -854,16 +827,44 @@
-

-ogmrip_subp_file_new ()

-
OGMRipFile*         ogmrip_subp_file_new                (const 
ogmrip_audio_file_get_channels ()

+
gint                ogmrip_audio_file_get_channels      (OGMRipAudioFile *audio);

+

+Gets the number of channels of an audio file.

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+


audio :
 An OGMRipAudioFile
+
Returns :
 an OGMDvdAudioChannels, or -1
+

+
+
+
+

ogmrip_subp_file_new ()

+
OGMRipFile*         ogmrip_subp_file_new                (const gchar *filename,
                                                          GError **error);

-Creates a new OGMRipSubpFile from a subtitle file.

+Creates a new OGMRipSubpFile from a subtitle file.

@@ -871,18 +872,18 @@ -filename : +

filename :

A filename -error : - A location to return an error of type OGMRIP_FILE_ERROR +

error :

+ A location to return an error of type OGMRIP_FILE_ERROR -Returns : - The new OGMRipSubpFile +

Returns :

+ The new OGMRipSubpFile @@ -890,11 +891,10 @@
-

-ogmrip_subp_file_get_charset ()

-
ogmrip_subp_file_get_charset ()

+
gint                ogmrip_subp_file_get_charset        (OGMRipSubpFile *subp);

+>gint                ogmrip_subp_file_get_charset        (OGMRipSubpFile *subp);

Gets the character set of a subtitle file.

@@ -904,13 +904,13 @@ -subp : - An OGMRipSubpFile +

subp :

+ An OGMRipSubpFile -Returns : - The OGMRipCharset, or -1 +

Returns :

+ The OGMRipCharset, or -1 @@ -918,5 +918,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-ogmrip-fs.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-ogmrip-fs.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-ogmrip-fs.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-ogmrip-fs.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + Filesystem - + - + - + - - + + - + @@ -29,39 +29,40 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-Filesystem -

-

Filesystem — Functions for handling files, directories, links and fifos

+

Filesystem

+

Filesystem — Functions for handling files, directories, links and fifos
-

Synopsis

+

Synopsis

 
 #include <ogmrip-fs.h>
 
-
-enum                OGMRipFsError;
-#define             OGMRIP_FS_ERROR
+void                ogmrip_fs_unref                     (gchar *filename,
+                                                         gboolean do_unlink);
 gchar*              ogmrip_fs_get_tmp_dir               (void);
-void                ogmrip_fs_set_tmp_dir               (const gchar*              ogmrip_fs_get_tmp_dir               (void);
+void                ogmrip_fs_set_tmp_dir               (const gchar *dir);
 gboolean            ogmrip_fs_mkdir                     (const gboolean            ogmrip_fs_mkdir                     (const gchar *path,
                                                          mode_t mode,
@@ -70,7 +71,7 @@
 >GError **error);
 gboolean            ogmrip_fs_rmdir                     (const gboolean            ogmrip_fs_rmdir                     (const gchar *path,
                                                          GError **error);
 gchar*              ogmrip_fs_mktemp                    (const gchar*              ogmrip_fs_mktemp                    (const gchar *tmpl,
                                                          GError **error);
 gchar*              ogmrip_fs_mkftemp                   (const gchar*              ogmrip_fs_mkftemp                   (const gchar *tmpl,
                                                          GError **error);
 gchar*              ogmrip_fs_mkdtemp                   (const gchar*              ogmrip_fs_mkdtemp                   (const gchar *tmpl,
                                                          GError **error);
 gchar*              ogmrip_fs_lntemp                    (const gchar*              ogmrip_fs_lntemp                    (const gchar *oldpath,
                                                          const GError **error);
 gint                ogmrip_fs_open_tmp                  (const gint                ogmrip_fs_open_tmp                  (const gchar *tmpl,
                                                          GError **error);
 gint64              ogmrip_fs_get_left_space            (const gint64              ogmrip_fs_get_left_space            (const gchar *filename);
+>gchar *filename,
+                                                         GError **error);
 gchar*              ogmrip_fs_get_mount_point           (const gchar*              ogmrip_fs_get_mount_point           (const gchar *filename,
+                                                         GError **error);
+gchar*              ogmrip_fs_get_extension             (const gchar *filename);
-void                ogmrip_fs_unref                     (gchar*              ogmrip_fs_set_extension             (const gchar *filename,
-                                                         gboolean do_unlink);
+                                                         const gchar *extension);
 gboolean            ogmrip_fs_rename                    (const gboolean            ogmrip_fs_rename                    (const gchar *old_name,
                                                          const
-

Description

+

Description

@@ -166,18 +180,20 @@

-

Details

+

Details

-

-enum OGMRipFsError

-
typedef enum
-{
-  OGMRIP_FS_ERROR_NONE,
-  OGMRIP_FS_ERROR_INTERNAL
-} OGMRipFsError;
-
+

ogmrip_fs_unref ()

+
void                ogmrip_fs_unref                     (gchar *filename,
+                                                         gboolean do_unlink);

-Error codes returned by OGMRipFs functions.

+If do_unlink is TRUE, recursively removes filename then frees the memory +pointed to by filename.

@@ -185,13 +201,15 @@ -OGMRIP_FS_ERROR_NONE - No error +

filename :

+ A path to a filename -OGMRIP_FS_ERROR_INTERNAL - Unknown error +

do_unlink :

+ TRUE to also remove the file @@ -199,24 +217,8 @@
-

-OGMRIP_FS_ERROR

-
#define OGMRIP_FS_ERROR ogmrip_fs_error_quark ()
-
-

-Error domain for fs operations. Errors in this domain will be from the -OGMRipFsError enumeration. See GError for information on error domains.

-

- -

-
-
-
-

-ogmrip_fs_get_tmp_dir ()

-
ogmrip_fs_get_tmp_dir ()

+
gchar*              ogmrip_fs_get_tmp_dir               (void);

 

@@ -227,7 +229,7 @@
 

-
+
@@ -235,9 +237,8 @@
 

-

-ogmrip_fs_set_tmp_dir ()

-
void                ogmrip_fs_set_tmp_dir               (const 
ogmrip_fs_set_tmp_dir ()

+
void                ogmrip_fs_set_tmp_dir               (const gchar *dir);

 

@@ -249,7 +250,7 @@
 

 
 
Returns :
Returns :

  The temporaty directory
 
 

 
 

-
+
@@ -257,9 +258,8 @@
 

-

-ogmrip_fs_mkdir ()

-
ogmrip_fs_mkdir ()

+
gboolean            ogmrip_fs_mkdir                     (const 
 

-
+
-
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -407,9 +407,8 @@
 
 

 

-

-ogmrip_fs_mkftemp ()

-
ogmrip_fs_mkftemp ()

+
gchar*              ogmrip_fs_mkftemp                   (const GError **error);

 

 Creates a fifo in OGMRip's temporary directory (as returned by
-ogmrip_fs_get_tmp_dir()).

+ogmrip_fs_get_tmp_dir()).

 

 
 

@@ -427,19 +426,19 @@
 

-
+
-
+
-
+
@@ -448,9 +447,8 @@
 

-

-ogmrip_fs_mkdtemp ()

-
ogmrip_fs_mkdtemp ()

+
gchar*              ogmrip_fs_mkdtemp                   (const GError **error);

 

 Creates a directory in OGMRip's temporary directory (as returned by
-ogmrip_fs_get_tmp_dir()).

+ogmrip_fs_get_tmp_dir()).

 

 
 

@@ -468,19 +466,19 @@
 

-
+
-
+
-
+
@@ -489,9 +487,8 @@
 

-

-ogmrip_fs_lntemp ()

-
ogmrip_fs_lntemp ()

+
gchar*              ogmrip_fs_lntemp                    (const GError **error);

 

 Creates a link in OGMRip's temporary directory (as * returned by
-ogmrip_fs_get_tmp_dir()) to æn existing file.

+ogmrip_fs_get_tmp_dir()) to æn existing file.

 

 
 

@@ -515,31 +512,31 @@
 

-
+
-
+
-
+
-
+
-
+
@@ -548,9 +545,8 @@
 

-

-ogmrip_fs_open_tmp ()

-
ogmrip_fs_open_tmp ()

+
gint                ogmrip_fs_open_tmp                  (const 
 

-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
@@ -634,13 +639,15 @@
 
 

 

-

-ogmrip_fs_get_mount_point ()

-
ogmrip_fs_get_mount_point ()

+
gchar*              ogmrip_fs_get_mount_point           (const gchar *filename);

+>gchar *filename,
+                                                         GError **error);

 

 Returns the mount point of the device containing filename.

 

@@ -650,12 +657,19 @@
 

-
+
-
+
+
+
+
+
@@ -664,19 +678,47 @@
 

-

-ogmrip_fs_unref ()

-
void                ogmrip_fs_unref                     (
ogmrip_fs_get_extension ()

+
gchar*              ogmrip_fs_get_extension             (const gchar *filename);

+

+Returns the extension of filename.

+

+
+

+

 
 
dir :
dir :

  The new temporary directory
 
 

 
 
 
path :
path :

  A path of directories
 
 

 
mode :
mode :

  The file mode
 
 

 
error : A location to return an error of type OGMRIP_FS_ERROR
+
error :
 A location to return an error of type G_FILE_ERROR
 
 

 
Returns :
Returns :

  TRUE on success, 
 

 

-

-ogmrip_fs_rmdir ()

-
ogmrip_fs_rmdir ()

+
gboolean            ogmrip_fs_rmdir                     (const 
 

 
path :
path :

  A path to a directory
 
 

 
recursive :
recursive :

  TRUE to remove the directory and its content recursively
 
 

 
error :
error :

  A location to return an error of type G_FILE_ERROR
 
 

 
Returns :
Returns :

  TRUE on success, 
 

 

-

-ogmrip_fs_mktemp ()

-
ogmrip_fs_mktemp ()

+
gchar*              ogmrip_fs_mktemp                    (const GError **error);

 

 Creates a file in OGMRip's temporary directory (as returned by
-ogmrip_fs_get_tmp_dir()).

+ogmrip_fs_get_tmp_dir()).

 

 
 

@@ -384,21 +384,21 @@
 

 
 
tmpl :
tmpl :

  Template for file name, as in g_mkstemp(), basename only
 
 

 
error :
error :

  A location to return an error of type G_FILE_ERROR
 
 

 
Returns :
Returns :

  The actual name used, or NULL
 
 

 
 
tmpl :
tmpl :

  Template for fifo name, basename only
 
 

 
error :
error :

  A location to return an error of type G_FILE_ERROR
 
 

 
Returns :
Returns :

  The actual name used, or NULL
 
 

 
 
 
 
tmpl :
tmpl :

  Template for directory name, basename only
 
 

 
error :
error :

  A location to return an error of type G_FILE_ERROR
 
 

 
Returns :
Returns :

  The actual name used, or NULL
 
 

 
 
 
 
oldpath :
oldpath :

  A path to an existing file
 
 

 
newtmpl :
newtmpl :

  Template for link name, basename only
 
 

 
symln :
symln :

  TRUE to create a symbolic link
 
 

 
error :
error :

  A location to return an error of type G_FILE_ERROR
 
 

 
Returns :
Returns :

  The actual name used, or NULL
 
 

 
 
 
tmpl :
tmpl :

  Template for file name, as in g_mkstemp(), basename only
 
 

 
name_used :
name_used :

  Location to store actual name used
 
 

 
error :
error :

  A location to return an error of type G_FILE_ERROR
 
 

 
Returns :
Returns :

  A file handle (as from open()) to the file opened for reading and
 writing. The file is opened in binary mode on platforms where there is a
 difference. The file handle should be closed with close(). In case of errors,
@@ -604,13 +600,15 @@
 
 

 

-

-ogmrip_fs_get_left_space ()

-
ogmrip_fs_get_left_space ()

+
gint64              ogmrip_fs_get_left_space            (const gchar *filename);

+>gchar *filename,
+                                                         GError **error);

 

 Returns the space left in bytes on the device containing filename.

 

@@ -620,12 +618,19 @@
 

 
 
filename :
filename :

  A path to a filename
 
 

 
Returns :
error :
 A location to return an error of type G_FILE_ERROR
+
Returns :

  The space left in bytes, or -1
 
 

 
 
filename :
filename :

  A path to a filename
 
 

 
Returns :
error :
 A location to return an error of type G_FILE_ERROR
+
Returns :

  The moint point, or NULL
 
 

 
 

++
+
+
+
+
+
+
+
+
+
+


filename :
 The path to an existing filename
+
Returns :
 The extension, or NULL
+

+
+
+
+

ogmrip_fs_set_extension ()

+
gchar*              ogmrip_fs_set_extension             (const gchar *filename,
-                                                         gboolean do_unlink);
+ const gchar *extension);

-If do_unlink is TRUE, recursively removes filename then frees the memory -pointed to by filename.

+If filename already has an extension, replaces it with extension. If not, +appends extension to filename.

@@ -684,15 +726,18 @@ -filename : - A path to a filename +

filename :

+ The path to an existing filename -do_unlink : - TRUE to also remove the file +

extension :

+ The new extension + + + +

Returns :

+ The new name of the file, or NULL @@ -700,9 +745,8 @@
-

-ogmrip_fs_rename ()

-
ogmrip_fs_rename ()

+
gboolean            ogmrip_fs_rename                    (const 
 
 
-old_name :
+
old_name :

  The path to an existing filename
 
 
 
-new_name :
+
new_name :

  The new name of the file
 
 
 
-error :
+
error :

  A location to return an error of type G_FILE_ERROR
 
 
 
-Returns :
+
Returns :

  TRUE on success,
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipLavc.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipLavc.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipLavc.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipLavc.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipLavc - + - - - - + + + + - - + + - + @@ -23,44 +23,31 @@ - - + + - + - +
-

-OGMRipLavc -

-

OGMRipLavc — A video codec to encode in Mpeg4

+

OGMRipLavc

+

OGMRipLavc — A video codec to encode in Mpeg4
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipLavc;
-enum                OGMRipLavcHeaderType;
-OGMJobSpawn*        ogmrip_lavc_new                     (OGMDvdTitle *title,
-                                                         const gchar *output);
-void                ogmrip_lavc_set_cmp                 (OGMRipLavc *lavc,
+                    OGMRipLavc;
+enum                OGMRipLavcHeaderType;
+void                ogmrip_lavc_set_cmp                 (OGMRipLavc *lavc,
                                                          guint cmp,
@@ -70,7 +57,7 @@
                                                          guint subcmp);
-void                ogmrip_lavc_get_cmp                 (OGMRipLavc *lavc,
+void                ogmrip_lavc_get_cmp                 (OGMRipLavc *lavc,
                                                          guint *cmp,
@@ -80,41 +67,130 @@
                                                          guint *subcmp);
-void                ogmrip_lavc_set_dia                 (OGMRipLavc *lavc,
+void                ogmrip_lavc_set_dia                 (OGMRipLavc *lavc,
                                                          gint dia,
                                                          gint predia);
-void                ogmrip_lavc_get_dia                 (OGMRipLavc *lavc,
+void                ogmrip_lavc_get_dia                 (OGMRipLavc *lavc,
                                                          gint *dia,
                                                          gint *predia);
-void                ogmrip_lavc_set_header              (OGMRipLavc *lavc,
-                                                         OGMRipLavcHeaderType header);
+void                ogmrip_lavc_set_header              (OGMRipLavc *lavc,
+                                                         OGMRipLavcHeaderType header);
 gint                ogmrip_lavc_get_header              (OGMRipLavc *lavc);
-
+>gint                ogmrip_lavc_get_header              (OGMRipLavc *lavc);
+void                ogmrip_lavc_set_buf_size            (OGMRipLavc *lavc,
+                                                         guint buf_size);
+gint                ogmrip_lavc_get_buf_size            (OGMRipLavc *lavc);
+void                ogmrip_lavc_set_dc                  (OGMRipLavc *lavc,
+                                                         guint dc);
+gint                ogmrip_lavc_get_dc                  (OGMRipLavc *lavc);
+void                ogmrip_lavc_set_keyint              (OGMRipLavc *lavc,
+                                                         guint keyint);
+gint                ogmrip_lavc_get_keyint              (OGMRipLavc *lavc);
+void                ogmrip_lavc_set_last_pred           (OGMRipLavc *lavc,
+                                                         guint last_pred);
+gint                ogmrip_lavc_get_last_pred           (OGMRipLavc *lavc);
+void                ogmrip_lavc_set_max_rate            (OGMRipLavc *lavc,
+                                                         guint max_rate);
+gint                ogmrip_lavc_get_max_rate            (OGMRipLavc *lavc);
+void                ogmrip_lavc_set_mbd                 (OGMRipLavc *lavc,
+                                                         guint mbd);
+gint                ogmrip_lavc_get_mbd                 (OGMRipLavc *lavc);
+void                ogmrip_lavc_set_min_rate            (OGMRipLavc *lavc,
+                                                         guint min_rate);
+gint                ogmrip_lavc_get_min_rate            (OGMRipLavc *lavc);
+void                ogmrip_lavc_set_mv0                 (OGMRipLavc *lavc,
+                                                         gboolean mv0);
+gboolean            ogmrip_lavc_get_mv0                 (OGMRipLavc *lavc);
+void                ogmrip_lavc_set_preme               (OGMRipLavc *lavc,
+                                                         guint preme);
+gint                ogmrip_lavc_get_preme               (OGMRipLavc *lavc);
+void                ogmrip_lavc_set_qns                 (OGMRipLavc *lavc,
+                                                         guint qns);
+gint                ogmrip_lavc_get_qns                 (OGMRipLavc *lavc);
+void                ogmrip_lavc_set_strict              (OGMRipLavc *lavc,
+                                                         guint strict);
+gint                ogmrip_lavc_get_strict              (OGMRipLavc *lavc);
+void                ogmrip_lavc_set_vb_strategy         (OGMRipLavc *lavc,
+                                                         guint vb_strategy);
+gint                ogmrip_lavc_get_vb_strategy         (OGMRipLavc *lavc);
+void                ogmrip_lavc_set_vqcomp              (OGMRipLavc *lavc,
+                                                         gdouble vqcomp);
+gdouble             ogmrip_lavc_get_vqcomp              (OGMRipLavc *lavc);
-

Description

+

Description

-

Details

+

Details

-

-OGMRipLavc

-
typedef struct {
-  OGMRipVideo parent_instance;
+
OGMRipLavc

+
typedef struct {
+  OGMRipVideoCodec parent_instance;
 
   OGMRipLavcPriv *priv;
 } OGMRipLavc;
@@ -125,9 +201,8 @@
-

-enum OGMRipLavcHeaderType

-
typedef enum
+
enum OGMRipLavcHeaderType

+
typedef enum
 {
   OGMRIP_LAVC_HEADER_AUTO,
   OGMRIP_LAVC_HEADER_EXTRADATA,
@@ -141,49 +216,8 @@
-

-ogmrip_lavc_new ()

-
OGMJobSpawn*        ogmrip_lavc_new                     (OGMDvdTitle *title,
-                                                         const gchar *output);
-

-Creates a new OGMRipLavc

-

- -

-
-- - - - - - - - - - - - - - -
title : An OGMDvdTitle -
output : The output file -
Returns : The new OGMRipLavc -
-
-
-
-

-ogmrip_lavc_set_cmp ()

-
void                ogmrip_lavc_set_cmp                 (OGMRipLavc *lavc,
+
ogmrip_lavc_set_cmp ()

+
void                ogmrip_lavc_set_cmp                 (OGMRipLavc *lavc,
                                                          guint cmp,
@@ -202,22 +236,22 @@
 
 
 
-lavc :
- An OGMRipLavc
+
lavc :

+ An OGMRipLavc
 
 
 
-cmp :
+
cmp :

  The comparison function for full pel motion estimation
 
 
 
-precmp :
+
precmp :

  The comparison function for motion estimation pre pass
 
 
 
-subcmp :
+
subcmp :

  The comparison function for sub pel motion estimation
 
 
@@ -226,9 +260,8 @@
-

-ogmrip_lavc_get_cmp ()

-
void                ogmrip_lavc_get_cmp                 (OGMRipLavc *lavc,
+
ogmrip_lavc_get_cmp ()

+
void                ogmrip_lavc_get_cmp                 (OGMRipLavc *lavc,
                                                          guint *cmp,
@@ -247,22 +280,22 @@
 
 
 
-lavc :
- An OGMRipLavc
+
lavc :

+ An OGMRipLavc
 
 
 
-cmp :
+
cmp :

  A pointer to store the comparison function for full pel motion estimation
 
 
 
-precmp :
+
precmp :

  A pointer to store the comparison function for motion estimation pre pass
 
 
 
-subcmp :
+
subcmp :

  A pointer to store the comparison function for sub pel motion estimation
 
 
@@ -271,9 +304,8 @@
-

-ogmrip_lavc_set_dia ()

-
void                ogmrip_lavc_set_dia                 (OGMRipLavc *lavc,
+
ogmrip_lavc_set_dia ()

+
void                ogmrip_lavc_set_dia                 (OGMRipLavc *lavc,
                                                          gint dia,
@@ -289,17 +321,17 @@
 
 
 
-lavc :
- An OGMRipLavc
+
lavc :

+ An OGMRipLavc
 
 
 
-dia :
+
dia :

  The diamond type and size for full pel motion estimation
 
 
 
-predia :
+
predia :

  The diamond type and size for motion estimation pre-pass
 
 
@@ -308,9 +340,8 @@
-

-ogmrip_lavc_get_dia ()

-
void                ogmrip_lavc_get_dia                 (OGMRipLavc *lavc,
+
ogmrip_lavc_get_dia ()

+
void                ogmrip_lavc_get_dia                 (OGMRipLavc *lavc,
                                                          gint *dia,
@@ -326,17 +357,17 @@
 
 
 
-lavc :
- An OGMRipLavc
+
lavc :

+ An OGMRipLavc
 
 
 
-dia :
+
dia :

  A pointer to store the diamond type and size for full pel motion estimation
 
 
 
-predia :
+
predia :

  A pointer to store the diamond type and size for motion estimation pre-pass
 
 
@@ -345,10 +376,9 @@
-

-ogmrip_lavc_set_header ()

-
void                ogmrip_lavc_set_header              (OGMRipLavc *lavc,
-                                                         OGMRipLavcHeaderType header);
+

ogmrip_lavc_set_header ()

+
void                ogmrip_lavc_set_header              (OGMRipLavc *lavc,
+                                                         OGMRipLavcHeaderType header);

Sets the global video header type.

@@ -358,13 +388,13 @@ -lavc : - An OGMRipLavc +

lavc :

+ An OGMRipLavc -header : - The OGMRipLavcHeaderType +

header :

+ The OGMRipLavcHeaderType @@ -372,11 +402,10 @@
-

-ogmrip_lavc_get_header ()

-
ogmrip_lavc_get_header ()

+
gint                ogmrip_lavc_get_header              (OGMRipLavc *lavc);

+>gint                ogmrip_lavc_get_header              (OGMRipLavc *lavc);

Gets the global video header type.

@@ -386,19 +415,737 @@ -lavc : - An OGMRipLavc +

lavc :

+ An OGMRipLavc + + + +

Returns :

+ The current OGMRipLavcHeaderType, or -1 + + + +
+
+
+
+

ogmrip_lavc_set_buf_size ()

+
void                ogmrip_lavc_set_buf_size            (OGMRipLavc *lavc,
+                                                         guint buf_size);
+

+Sets the buffer size in kb

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

buf_size :

 A buffer size +
+
+
+
+

ogmrip_lavc_get_buf_size ()

+
gint                ogmrip_lavc_get_buf_size            (OGMRipLavc *lavc);
+

+Gets the buffer size in kb

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

Returns :

 The buffer size, or -1 +
+
+
+
+

ogmrip_lavc_set_dc ()

+
void                ogmrip_lavc_set_dc                  (OGMRipLavc *lavc,
+                                                         guint dc);
+

+Sets the intra DC precision in bits

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

dc :

 A precision +
+
+
+
+

ogmrip_lavc_get_dc ()

+
gint                ogmrip_lavc_get_dc                  (OGMRipLavc *lavc);
+

+Gets the intra DC precision in bits

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

Returns :

 The precision, or -1 +
+
+
+
+

ogmrip_lavc_set_keyint ()

+
void                ogmrip_lavc_set_keyint              (OGMRipLavc *lavc,
+                                                         guint keyint);
+

+Sets the maximum interval between key frames

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

keyint :

 An intervale +
+
+
+
+

ogmrip_lavc_get_keyint ()

+
gint                ogmrip_lavc_get_keyint              (OGMRipLavc *lavc);
+

+Gets the maximum interval between key frames

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

Returns :

 The interval, or -1 +
+
+
+
+

ogmrip_lavc_set_last_pred ()

+
void                ogmrip_lavc_set_last_pred           (OGMRipLavc *lavc,
+                                                         guint last_pred);
+

+Sets the amount of motion predictors from the previous frame

+

+ +

+
++ + + + - - +

lavc :

 An OGMRipLavc
Returns : The current OGMRipLavcHeaderType, or -1 +

last_pred :

 The last_pred
+
+
+

ogmrip_lavc_get_last_pred ()

+
gint                ogmrip_lavc_get_last_pred           (OGMRipLavc *lavc);
+

+Gets the amount of motion predictors from the previous frame

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

Returns :

 The amount, or -1 +
+
+
+

ogmrip_lavc_set_max_rate ()

+
void                ogmrip_lavc_set_max_rate            (OGMRipLavc *lavc,
+                                                         guint max_rate);
+

+Sets the maximum bitrate in kbps

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

max_rate :

 A bitrate +
+
+
+

ogmrip_lavc_get_max_rate ()

+
gint                ogmrip_lavc_get_max_rate            (OGMRipLavc *lavc);
+

+Gets the maximum bitrate in kbps

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

Returns :

 The bitrate, or -1 +
+
+
+
+

ogmrip_lavc_set_mbd ()

+
void                ogmrip_lavc_set_mbd                 (OGMRipLavc *lavc,
+                                                         guint mbd);
+

+Sets the macroblock decision algorithm

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

mbd :

 The mbd +
+
+
+
+

ogmrip_lavc_get_mbd ()

+
gint                ogmrip_lavc_get_mbd                 (OGMRipLavc *lavc);
+

+Gets the macroblock decision algorithm

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

Returns :

 The algorithm, or -1 +
+
+
+
+

ogmrip_lavc_set_min_rate ()

+
void                ogmrip_lavc_set_min_rate            (OGMRipLavc *lavc,
+                                                         guint min_rate);
+

+Sets the minimum bitrate in kbps

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

min_rate :

 A bitrate +
+
+
+
+

ogmrip_lavc_get_min_rate ()

+
gint                ogmrip_lavc_get_min_rate            (OGMRipLavc *lavc);
+

+Gets the minimum bitrate in kbps

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

Returns :

 The bitrate, or -1 +
+
+
+
+

ogmrip_lavc_set_mv0 ()

+
void                ogmrip_lavc_set_mv0                 (OGMRipLavc *lavc,
+                                                         gboolean mv0);
+

+Try to encode each MB with MV=<0,0>

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

mv0 :

 TRUE to enable mv0 +
+
+
+
+

ogmrip_lavc_get_mv0 ()

+
gboolean            ogmrip_lavc_get_mv0                 (OGMRipLavc *lavc);
+

+Gets whether to try to encode each MB with MV=<0,0>

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

Returns :

 TRUE if mv0 is enabled +
+
+
+
+

ogmrip_lavc_set_preme ()

+
void                ogmrip_lavc_set_preme               (OGMRipLavc *lavc,
+                                                         guint preme);
+

+Sets the motion estimation pre-pass

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

preme :

 The estimation +
+
+
+
+

ogmrip_lavc_get_preme ()

+
gint                ogmrip_lavc_get_preme               (OGMRipLavc *lavc);
+

+Gets the motion estimation pre-pass

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

Returns :

 The estimation, or -1 +
+
+
+
+

ogmrip_lavc_set_qns ()

+
void                ogmrip_lavc_set_qns                 (OGMRipLavc *lavc,
+                                                         guint qns);
+

+Sets the quantizer noise shaping

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

qns :

 The shaping +
+
+
+
+

ogmrip_lavc_get_qns ()

+
gint                ogmrip_lavc_get_qns                 (OGMRipLavc *lavc);
+

+Gets the quantizer noise shaping

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

Returns :

 The shaping, or -1 +
+
+
+
+

ogmrip_lavc_set_strict ()

+
void                ogmrip_lavc_set_strict              (OGMRipLavc *lavc,
+                                                         guint strict);
+

+Sets the strict standard compliancy

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

strict :

 The strictness +
+
+
+
+

ogmrip_lavc_get_strict ()

+
gint                ogmrip_lavc_get_strict              (OGMRipLavc *lavc);
+

+Gets the strict standard compliancy

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

Returns :

 The strictness, or -1 +
+
+
+
+

ogmrip_lavc_set_vb_strategy ()

+
void                ogmrip_lavc_set_vb_strategy         (OGMRipLavc *lavc,
+                                                         guint vb_strategy);
+

+Sets the strategy to choose between I/P/B-frames

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

vb_strategy :

 A strategy +
+
+
+
+

ogmrip_lavc_get_vb_strategy ()

+
gint                ogmrip_lavc_get_vb_strategy         (OGMRipLavc *lavc);
+

+Gets the strategy to choose between I/P/B-frames

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

Returns :

 The strategy, or -1 +
+
+
+
+

ogmrip_lavc_set_vqcomp ()

+
void                ogmrip_lavc_set_vqcomp              (OGMRipLavc *lavc,
+                                                         gdouble vqcomp);
+

+Sets the quantizer compression

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

vqcomp :

 The vqcomp +
+
+
+
+

ogmrip_lavc_get_vqcomp ()

+
gdouble             ogmrip_lavc_get_vqcomp              (OGMRipLavc *lavc);
+

+Gets the quantizer compression

+

+ +

+
++ + + + + + + + + + +

lavc :

 An OGMRipLavc +

Returns :

 The compression, or -1 +
+
+
+
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipLavcMpeg4.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipLavcMpeg4.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipLavcMpeg4.html 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipLavcMpeg4.html 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,122 @@ + + + + +OGMRipLavcMpeg4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

OGMRipLavcMpeg4

+

OGMRipLavcMpeg4

+
+
+

Synopsis

+
+                    OGMRipLavcMpeg4;
+OGMJobSpawn*        ogmrip_lavc_mpeg4_new               (OGMDvdTitle *title,
+                                                         const gchar *output);
+
+
+
+

Description

+

+ +

+
+
+

Details

+
+

OGMRipLavcMpeg4

+
typedef struct {
+  OGMRipLavc parent_instance;
+} OGMRipLavcMpeg4;
+
+

+ +

+
+
+
+

ogmrip_lavc_mpeg4_new ()

+
OGMJobSpawn*        ogmrip_lavc_mpeg4_new               (OGMDvdTitle *title,
+                                                         const gchar *output);
+

+Creates a new OGMRipLavcMpeg4.

+

+ +

+
++ + + + + + + + + + + + + + +

title :

 An OGMDvdTitle +

output :

 The output file +

Returns :

 the new OGMRipLavcMpeg4 +
+
+
+
+
+
+ Generated by GTK-Doc V1.10
+ + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipMatroska.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipMatroska.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipMatroska.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipMatroska.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipMatroska - + - + - - + + - + @@ -29,48 +29,41 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-OGMRipMatroska -

-

OGMRipMatroska — The Matroska container

+

OGMRipMatroska

+

OGMRipMatroska — The Matroska container
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipMatroska;
+                    OGMRipMatroska;
 OGMJobSpawn*        ogmrip_matroska_new                 (const OGMJobSpawn*        ogmrip_matroska_new                 (const gchar *output);
-
-

Description

+

Description

-

Details

+

Details

-

-OGMRipMatroska

-
typedef struct {
+
OGMRipMatroska

+
typedef struct {
   OGMRipContainer parent_instance;
 } OGMRipMatroska;
 

@@ -80,15 +73,14 @@
-

-ogmrip_matroska_new ()

-
ogmrip_matroska_new ()

+
OGMJobSpawn*        ogmrip_matroska_new                 (const gchar *output);

 

-Creates a new OGMRipMatroska.

+Creates a new OGMRipMatroska.

 

 
 

@@ -96,13 +88,13 @@
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- The new OGMRipMatroska
+
Returns :

+ The new OGMRipMatroska
 
 
 
@@ -110,5 +102,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipMp3.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipMp3.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipMp3.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipMp3.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipMp3 - + - + - - + + - + @@ -29,54 +29,45 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-OGMRipMp3 -

-

OGMRipMp3 — An audio codec to encode in MP3

+

OGMRipMp3

+

OGMRipMp3 — An audio codec to encode in MP3
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipMp3;
+                    OGMRipMp3;
 OGMJobSpawn*        ogmrip_mp3_new                      (OGMJobSpawn*        ogmrip_mp3_new                      (OGMDvdAudioStream *audio,
                                                          const gchar *output);
-
-

Description

+

Description

-

Details

+

Details

-

-OGMRipMp3

-
typedef struct {
-  OGMRipAudio parent_instance;
-
-  OGMRipMp3Priv *priv;
+
OGMRipMp3

+
typedef struct {
+  OGMRipAudioCodec parent_instance;
 } OGMRipMp3;
 

 

@@ -85,18 +76,17 @@
-

-ogmrip_mp3_new ()

-
ogmrip_mp3_new ()

+
OGMJobSpawn*        ogmrip_mp3_new                      (OGMDvdAudioStream *audio,
                                                          const gchar *output);

 

-Creates a new OGMRipMp3.

+Creates a new OGMRipMp3.

 

 
 

@@ -104,20 +94,20 @@
 
 
 
-audio :
+
audio :

  An OGMDvdAudioStream
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- The new OGMRipMp3
+
Returns :

+ The new OGMRipMp3
 
 
 
@@ -125,5 +115,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipMp4.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipMp4.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipMp4.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipMp4.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipMp4 - + - + - - + + - + @@ -29,49 +29,44 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-OGMRipMp4 -

-

OGMRipMp4 — The MP4 container

+

OGMRipMp4

+

OGMRipMp4 — The MP4 container
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipMp4;
+                    OGMRipMp4;
 OGMJobSpawn*        ogmrip_mp4_new                      (const OGMJobSpawn*        ogmrip_mp4_new                      (const gchar *output);
-
-

Description

+

Description

-

Details

+

Details

-

-OGMRipMp4

-
typedef struct {
+
OGMRipMp4

+
typedef struct {
   OGMRipContainer parent_instance;
+
+  OGMRipMp4Priv *priv;
 } OGMRipMp4;
 

 

@@ -80,15 +75,14 @@
-

-ogmrip_mp4_new ()

-
ogmrip_mp4_new ()

+
OGMJobSpawn*        ogmrip_mp4_new                      (const gchar *output);

 

-Creates a new OGMRipMp4.

+Creates a new OGMRipMp4.

 

 
 

@@ -96,13 +90,13 @@
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- The new OGMRipMp4
+
Returns :

+ The new OGMRipMp4
 
 
 
@@ -110,5 +104,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-ogmrip-mplayer.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-ogmrip-mplayer.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-ogmrip-mplayer.html 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-ogmrip-mplayer.html 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,618 @@ + + + + +Mplayer + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

Mplayer

+

Mplayer — Common wrapper functions for mplayer and mencoder

+
+
+

Synopsis

+
+
+#include <ogmrip-mplayer.h>
+
+GPtrArray*          ogmrip_mencoder_audio_command       (OGMRipAudioCodec *audio,
+                                                         const gchar *output);
+gdouble             ogmrip_mencoder_codec_watch         (OGMJobExec *exec,
+                                                         const gchar *buffer,
+                                                         OGMRipCodec *codec);
+GPtrArray*          ogmrip_mencoder_container_command   (OGMRipContainer *container);
+gdouble             ogmrip_mencoder_container_watch     (OGMJobExec *exec,
+                                                         const gchar *buffer,
+                                                         OGMRipContainer *container);
+GPtrArray*          ogmrip_mencoder_video_command       (OGMRipVideoCodec *video,
+                                                         const gchar *output,
+                                                         guint pass);
+GPtrArray*          ogmrip_mencoder_vobsub_command      (OGMRipSubpCodec *subp,
+                                                         const gchar *output);
+gdouble             ogmrip_mencoder_vobsub_watch        (OGMJobExec *exec,
+                                                         const gchar *buffer,
+                                                         OGMRipSubpCodec *subp);
+GPtrArray*          ogmrip_mplayer_video_command        (OGMRipVideoCodec *video,
+                                                         const gchar *output);
+gdouble             ogmrip_mplayer_video_watch          (OGMJobExec *exec,
+                                                         const gchar *buffer,
+                                                         OGMRipVideoCodec *video);
+GPtrArray*          ogmrip_mplayer_wav_command          (OGMRipAudioCodec *audio,
+                                                         gboolean header,
+                                                         const gchar *output);
+gdouble             ogmrip_mplayer_wav_watch            (OGMJobExec *exec,
+                                                         const gchar *buffer,
+                                                         OGMRipAudioCodec *audio);
+
+
+
+

Description

+

+

+

+ +

+
+
+

Details

+
+

ogmrip_mencoder_audio_command ()

+
GPtrArray*          ogmrip_mencoder_audio_command       (OGMRipAudioCodec *audio,
+                                                         const gchar *output);
+

+This function creates the common part of the command line when using mencoder +to encode an audio stream.

+

+ +

+
++ + + + + + + + + + + + + + +

audio :

 An OGMRipAudioCodec +

output :

 The output file, or NULL +

Returns :

 A new GPtrArray, or NULL +
+
+
+
+

ogmrip_mencoder_codec_watch ()

+
gdouble             ogmrip_mencoder_codec_watch         (OGMJobExec *exec,
+                                                         const gchar *buffer,
+                                                         OGMRipCodec *codec);
+

+This function parses the output of mencoder when encoding a stream and +returns the progress made.

+

+ +

+
++ + + + + + + + + + + + + + + + + + +

exec :

 An OGMJobExec +

buffer :

 The buffer to parse +

codec :

 An OGMRipCodec +

Returns :

 The progress made, or -1.0 +
+
+
+
+

ogmrip_mencoder_container_command ()

+
GPtrArray*          ogmrip_mencoder_container_command   (OGMRipContainer *container);
+

+This function creates the common part of the command line to merge streams +using mencoder.

+

+ +

+
++ + + + + + + + + + +

container :

 An OGMRipContainer +

Returns :

 A new GPtrArray, or NULL +
+
+
+
+

ogmrip_mencoder_container_watch ()

+
gdouble             ogmrip_mencoder_container_watch     (OGMJobExec *exec,
+                                                         const gchar *buffer,
+                                                         OGMRipContainer *container);
+

+This function parses the output of mencoder when merging streams and returns +the progress made.

+

+ +

+
++ + + + + + + + + + + + + + + + + + +

exec :

 An OGMJobExec +

buffer :

 The buffer to parse +

container :

 An OGMRipContainer +

Returns :

 The progress made, or -1.0 +
+
+
+
+

ogmrip_mencoder_video_command ()

+
GPtrArray*          ogmrip_mencoder_video_command       (OGMRipVideoCodec *video,
+                                                         const gchar *output,
+                                                         guint pass);
+

+This function creates the common part of the command line when using mencoder +to encode a video stream.

+

+ +

+
++ + + + + + + + + + + + + + + + + + +

video :

 An OGMRipVideoCodec +

output :

 The output file, or NULL +

pass :

 The number of passes +

Returns :

 A new GPtrArray, or NULL +
+
+
+
+

ogmrip_mencoder_vobsub_command ()

+
GPtrArray*          ogmrip_mencoder_vobsub_command      (OGMRipSubpCodec *subp,
+                                                         const gchar *output);
+

+This function creates the command line for extracting VobSub subtitles +using mencoder.

+

+ +

+
++ + + + + + + + + + + + + + +

subp :

 An OGMRipSubpCodec +

output :

 The output file, or NULL +

Returns :

 A new GPtrArray, or NULL +
+
+
+
+

ogmrip_mencoder_vobsub_watch ()

+
gdouble             ogmrip_mencoder_vobsub_watch        (OGMJobExec *exec,
+                                                         const gchar *buffer,
+                                                         OGMRipSubpCodec *subp);
+

+This function parses the output of mencoder when extracting VobSub subtitles +and returns the progress made.

+

+ +

+
++ + + + + + + + + + + + + + + + + + +

exec :

 An OGMJobExec +

buffer :

 The buffer to parse +

subp :

 An OGMRipSubpCodec +

Returns :

 The progress made, or -1.0 +
+
+
+
+

ogmrip_mplayer_video_command ()

+
GPtrArray*          ogmrip_mplayer_video_command        (OGMRipVideoCodec *video,
+                                                         const gchar *output);
+

+This function creates the common part of the command line when using mplayer +to encode a video stream.

+

+ +

+
++ + + + + + + + + + + + + + +

video :

 An OGMRipVideoCodec +

output :

 The output file, or NULL +

Returns :

 A new GPtrArray, or NULL +
+
+
+
+

ogmrip_mplayer_video_watch ()

+
gdouble             ogmrip_mplayer_video_watch          (OGMJobExec *exec,
+                                                         const gchar *buffer,
+                                                         OGMRipVideoCodec *video);
+

+This function parses the output of mplayer when encoding a video stream and +returns the progress made.

+

+ +

+
++ + + + + + + + + + + + + + + + + + +

exec :

 An OGMJobExec +

buffer :

 The buffer to parse +

video :

 An OGMRipVideoCodec +

Returns :

 The progress made, or -1.0 +
+
+
+
+

ogmrip_mplayer_wav_command ()

+
GPtrArray*          ogmrip_mplayer_wav_command          (OGMRipAudioCodec *audio,
+                                                         gboolean header,
+                                                         const gchar *output);
+

+This function creates the command line for encoding an audio stream in PCM +or WAV.

+

+ +

+
++ + + + + + + + + + + + + + + + + + +

audio :

 An OGMRipAudioCodec +

header :

 Whether to add the PCM header +

output :

 The output file, or NULL +

Returns :

 A new GPtrArray, or NULL +
+
+
+
+

ogmrip_mplayer_wav_watch ()

+
gdouble             ogmrip_mplayer_wav_watch            (OGMJobExec *exec,
+                                                         const gchar *buffer,
+                                                         OGMRipAudioCodec *audio);
+

+This function parses the output of mplayer when encoding an audio stream in +WAV or PCM and returns the progress made.

+

+ +

+
++ + + + + + + + + + + + + + + + + + +

exec :

 An OGMJobExec +

buffer :

 The buffer to parse +

audio :

 An OGMRipAudioCodec +

Returns :

 The progress made, or -1.0 +
+
+
+
+
+
+ Generated by GTK-Doc V1.10
+ + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipOgg.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipOgg.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipOgg.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipOgg.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipOgg - + - + - - + + - + @@ -29,51 +29,42 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-OGMRipOgg -

-

OGMRipOgg — The Ogg Media container

+

OGMRipOgg

+

OGMRipOgg — The Ogg Media container
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipOgg;
+                    OGMRipOgg;
 OGMJobSpawn*        ogmrip_ogg_new                      (const OGMJobSpawn*        ogmrip_ogg_new                      (const gchar *output);
-
-

Description

+

Description

-

Details

+

Details

-

-OGMRipOgg

-
typedef struct {
+
OGMRipOgg

+
typedef struct {
   OGMRipContainer parent_instance;
-
-  OGMRipOggPriv *priv;
 } OGMRipOgg;
 

 

@@ -82,15 +73,14 @@
-

-ogmrip_ogg_new ()

-
ogmrip_ogg_new ()

+
OGMJobSpawn*        ogmrip_ogg_new                      (const gchar *output);

 

-Creates a new OGMRipOgg.

+Creates a new OGMRipOgg.

 

 
 

@@ -98,13 +88,13 @@
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- The new OGMRipOgg
+
Returns :

+ The new OGMRipOgg
 
 
 
@@ -112,5 +102,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-ogmrip-plugin.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-ogmrip-plugin.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-ogmrip-plugin.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-ogmrip-plugin.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + Plugins System - + - + - + - - + + - + @@ -29,33 +29,30 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-Plugins System -

-

Plugins System — Functions for manipulating the plugins

+

Plugins System

+

Plugins System — Functions for manipulating the plugins
-

Synopsis

+

Synopsis

 
 #include <ogmrip-plugin.h>
 
-
-                    OGMRipPluginVideoCodec;
-                    OGMRipPluginAudioCodec;
-                    OGMRipPluginSubpCodec;
-                    OGMRipPluginContainer;
-void                (*OGMRipPluginFunc)                 (OGMRipVideoPlugin;
+                    OGMRipAudioPlugin;
+                    OGMRipSubpPlugin;
+                    OGMRipContainerPlugin;
+void                (*OGMRipPluginFunc)                 (GType type,
                                                          const gpointer data);
 gint                (*OGMRipPluginCmpFunc)              (gint                (*OGMRipPluginCmpFunc)              (GType type,
                                                          const gconstpointer data);
-void                ogmrip_plugin_init                  (void);
-void                ogmrip_plugin_uninit                (void);
+void                ogmrip_plugin_init                  (void);
+void                ogmrip_plugin_uninit                (void);
 gint                ogmrip_plugin_get_n_containers      (void);
-void                ogmrip_plugin_foreach_container     (OGMRipPluginFunc func,
+>gint                ogmrip_plugin_get_n_containers      (void);
+void                ogmrip_plugin_foreach_container     (OGMRipPluginFunc func,
                                                          gpointer data);
 GType               ogmrip_plugin_find_container        (OGMRipPluginCmpFunc func,
+>GType               ogmrip_plugin_find_container        (OGMRipPluginCmpFunc func,
                                                          gconstpointer data);
 GType               ogmrip_plugin_get_nth_container     (GType               ogmrip_plugin_get_nth_container     (guint n);
 gchar*              ogmrip_plugin_get_container_name    (gchar*              ogmrip_plugin_get_container_name    (GType container);
 gint                ogmrip_plugin_get_container_index   (gint                ogmrip_plugin_get_container_index   (GType container);
 gboolean            ogmrip_plugin_get_container_bframes (gboolean            ogmrip_plugin_get_container_bframes (GType container);
 gint                ogmrip_plugin_get_container_max_audio
+>gint                ogmrip_plugin_get_container_max_audio
                                                         (GType container);
 gint                ogmrip_plugin_get_container_max_subp
+>gint                ogmrip_plugin_get_container_max_subp
                                                         (GType container);
 GType               ogmrip_plugin_get_container_by_name (const gchar *name);
+gint                ogmrip_plugin_get_n_video_codecs    (void);
-void                ogmrip_plugin_foreach_video_codec   (OGMRipPluginFunc func,
+>gint                ogmrip_plugin_get_n_video_codecs    (void);
+void                ogmrip_plugin_foreach_video_codec   (OGMRipPluginFunc func,
                                                          gpointer data);
 GType               ogmrip_plugin_find_video_codec      (OGMRipPluginCmpFunc func,
+>GType               ogmrip_plugin_find_video_codec      (OGMRipPluginCmpFunc func,
                                                          gconstpointer data);
 GType               ogmrip_plugin_get_nth_video_codec   (GType               ogmrip_plugin_get_nth_video_codec   (guint n);
 gchar*              ogmrip_plugin_get_video_codec_name  (gchar*              ogmrip_plugin_get_video_codec_name  (GType codec);
 gint                ogmrip_plugin_get_video_codec_index (gint                ogmrip_plugin_get_video_codec_index (GType codec);
 gint                ogmrip_plugin_get_video_codec_format
+>gint                ogmrip_plugin_get_video_codec_format
                                                         (GType codec);
 gint                ogmrip_plugin_get_video_codec_passes
+>gint                ogmrip_plugin_get_video_codec_passes
                                                         (GType codec);
 gint                ogmrip_plugin_get_video_codec_threads
+>gint                ogmrip_plugin_get_video_codec_threads
                                                         (GType codec);
 GType               ogmrip_plugin_get_video_codec_by_name
+                                                        (const gchar *name);
+gint                ogmrip_plugin_get_n_audio_codecs    (void);
-void                ogmrip_plugin_foreach_audio_codec   (OGMRipPluginFunc func,
+>gint                ogmrip_plugin_get_n_audio_codecs    (void);
+void                ogmrip_plugin_foreach_audio_codec   (OGMRipPluginFunc func,
                                                          gpointer data);
 GType               ogmrip_plugin_find_audio_codec      (OGMRipPluginCmpFunc func,
+>GType               ogmrip_plugin_find_audio_codec      (OGMRipPluginCmpFunc func,
                                                          gconstpointer data);
 GType               ogmrip_plugin_get_nth_audio_codec   (GType               ogmrip_plugin_get_nth_audio_codec   (guint n);
 gchar*              ogmrip_plugin_get_audio_codec_name  (gchar*              ogmrip_plugin_get_audio_codec_name  (GType codec);
 gint                ogmrip_plugin_get_audio_codec_index (gint                ogmrip_plugin_get_audio_codec_index (GType codec);
 gint                ogmrip_plugin_get_audio_codec_format
+>gint                ogmrip_plugin_get_audio_codec_format
                                                         (GType codec);
 GType               ogmrip_plugin_get_audio_codec_by_name
+                                                        (const gchar *name);
+gint                ogmrip_plugin_get_n_subp_codecs     (void);
-void                ogmrip_plugin_foreach_subp_codec    (OGMRipPluginFunc func,
+>gint                ogmrip_plugin_get_n_subp_codecs     (void);
+void                ogmrip_plugin_foreach_subp_codec    (OGMRipPluginFunc func,
                                                          gpointer data);
 GType               ogmrip_plugin_find_subp_codec       (OGMRipPluginCmpFunc func,
+>GType               ogmrip_plugin_find_subp_codec       (OGMRipPluginCmpFunc func,
                                                          gconstpointer data);
 GType               ogmrip_plugin_get_nth_subp_codec    (GType               ogmrip_plugin_get_nth_subp_codec    (guint n);
 gchar*              ogmrip_plugin_get_subp_codec_name   (gchar*              ogmrip_plugin_get_subp_codec_name   (GType codec);
 gint                ogmrip_plugin_get_subp_codec_index  (gint                ogmrip_plugin_get_subp_codec_index  (GType codec);
 gint                ogmrip_plugin_get_subp_codec_format (gint                ogmrip_plugin_get_subp_codec_format (GType codec);
 gboolean            ogmrip_plugin_get_subp_codec_text   (gboolean            ogmrip_plugin_get_subp_codec_text   (GType codec);
 GType               ogmrip_plugin_get_subp_codec_by_name
+                                                        (const gchar *name);
+gboolean            ogmrip_plugin_can_contain_video     (gboolean            ogmrip_plugin_can_contain_video     (GType container,
                                                          GType codec);
 gboolean            ogmrip_plugin_can_contain_audio     (gboolean            ogmrip_plugin_can_contain_audio     (GType container,
                                                          GType codec);
 gboolean            ogmrip_plugin_can_contain_subp      (gboolean            ogmrip_plugin_can_contain_subp      (GType container,
                                                          GType codec);
 gboolean            ogmrip_plugin_can_contain_format    (gboolean            ogmrip_plugin_can_contain_format    (GType container,
-                                                         OGMRipFormatType format);
+                                                         OGMRipFormatType format);
 gboolean            ogmrip_plugin_can_contain_n_audio   (gboolean            ogmrip_plugin_can_contain_n_audio   (GType container,
                                                          guint ncodec);
 gboolean            ogmrip_plugin_can_contain_n_subp    (gboolean            ogmrip_plugin_can_contain_n_subp    (GType container,
-

Description

+

Description

@@ -303,11 +323,10 @@

-

Details

+

Details

-

-OGMRipPluginVideoCodec

-
typedef struct {
+
OGMRipVideoPlugin

+
typedef struct {
   GModule *module;
   GType type;
   gchar *name;
@@ -315,7 +334,7 @@
   OGMRipFormatType format;
   gint passes;
   gint threads;
-} OGMRipPluginVideoCodec;
+} OGMRipVideoPlugin;
 

 

 A structure describing a video codec plugin

@@ -326,49 +345,49 @@
 
 
 
-
GModule *module;
+>GModule *module;

  For internal use only
 
 
 
-
GType type;
+>GType type;

  The type of the codec
 
 
 
-
gchar *name;
+>gchar *name;

  The name of the codec
 
 
 
-
gchar *description;
+>gchar *description;

  The description of the codec
 
 
 
-OGMRipFormatType format;
+
OGMRipFormatType format;

  The codec output format
 
 
 
-
gint passes;
+>gint passes;

  The number of passes supported by the codec
 
 
 
-
gint threads;
+>gint threads;

  The number of threads supported by the codec
 
 
@@ -377,15 +396,14 @@
-

-OGMRipPluginAudioCodec

-
typedef struct {
+
OGMRipAudioPlugin

+
typedef struct {
   GModule *module;
   GType type;
   gchar *name;
   gchar *description;
   OGMRipFormatType format;
-} OGMRipPluginAudioCodec;
+} OGMRipAudioPlugin;
 

 

 A structure describing an audio codec plugin

@@ -396,35 +414,35 @@
 
 
 
-
GModule *module;
+>GModule *module;

  For internal use only
 
 
 
-
GType type;
+>GType type;

  The type of the codec
 
 
 
-
gchar *name;
+>gchar *name;

  The name of the codec
 
 
 
-
gchar *description;
+>gchar *description;

  The description of the codec
 
 
 
-OGMRipFormatType format;
+
OGMRipFormatType format;

  The codec output format
 
 
@@ -433,16 +451,15 @@
-

-OGMRipPluginSubpCodec

-
typedef struct {
+
OGMRipSubpPlugin

+
typedef struct {
   GModule *module;
   GType type;
   gchar *name;
   gchar *description;
   OGMRipFormatType format;
   gboolean text;
-} OGMRipPluginSubpCodec;
+} OGMRipSubpPlugin;
 

 

 A structure describing a subtitle codec plugin

@@ -453,42 +470,42 @@
 
 
 
-
GModule *module;
+>GModule *module;

  For internal use only
 
 
 
-
GType type;
+>GType type;

  The type of the codec
 
 
 
-
gchar *name;
+>gchar *name;

  The name of the codec
 
 
 
-
gchar *description;
+>gchar *description;

  The description of the codec
 
 
 
-OGMRipFormatType format;
+
OGMRipFormatType format;

  The codec output format
 
 
 
-
gboolean text;
+>gboolean text;

  Whether the codec outputs text subtitles
 
 
@@ -497,9 +514,8 @@
-

-OGMRipPluginContainer

-
typedef struct {
+
OGMRipContainerPlugin

+
typedef struct {
   GModule *module;
   GType type;
   gchar *name;
@@ -508,7 +524,7 @@
   gint max_audio;
   gint max_subp;
   gint *formats;
-} OGMRipPluginContainer;
+} OGMRipContainerPlugin;
 

 

 A structure describing a container plugin

@@ -519,59 +535,59 @@
 
 
 
-
GModule *module;
+>GModule *module;

  For internal use only
 
 
 
-
GType type;
+>GType type;

  The type of the container
 
 
 
-
gchar *name;
+>gchar *name;

  The name of the container
 
 
 
-
gchar *description;
+>gchar *description;

  The description of the container
 
 
 
-
gboolean bframes;
+>gboolean bframes;

  Whether the container supports B-frames
 
 
 
-
gint max_audio;
+>gint max_audio;

  The maximum number of audio streams that can be embedded in the container
 
 
 
-
gint max_subp;
+>gint max_subp;

  The maximum number of subtitle streams that can be embedded in the container
 
 
 
-
gint *formats;
- A NULL terminated array of OGMRipFormatType supported by the container
+>gint *formats;

+ A NULL terminated array of OGMRipFormatType supported by the container
 
 
 
@@ -579,9 +595,8 @@
-

-OGMRipPluginFunc ()

-
void                (*OGMRipPluginFunc)                 (
OGMRipPluginFunc ()

+
void                (*OGMRipPluginFunc)                 (GType type,
                                                          const gpointer data);

 

-Specifies the type of functions passed to ogmrip_plugin_foreach_container(),
-ogmrip_plugin_foreach_video_codec(), ogmrip_plugin_foreach_audio_codec(),
-and ogmrip_plugin_foreach_subp_codec().

+Specifies the type of functions passed to ogmrip_plugin_foreach_container(),
+ogmrip_plugin_foreach_video_codec(), ogmrip_plugin_foreach_audio_codec(),
+and ogmrip_plugin_foreach_subp_codec().

 

 
 

@@ -604,22 +619,22 @@
 
 
 
-type :
+
type :

  The type of the plugin
 
 
 
-name :
+
name :

  The name of the plugin
 
 
 
-description :
+
description :

  The description of the plugin
 
 
 
-data :
+
data :

  The user data
 
 
@@ -628,9 +643,8 @@
-

-OGMRipPluginCmpFunc ()

-
OGMRipPluginCmpFunc ()

+
gint                (*OGMRipPluginCmpFunc)              (gconstpointer data);

 

-Specifieѕ the type of functions passed to ogmrip_plugin_find_container(),
-ogmrip_plugin_find_video_codec(), ogmrip_plugin_find_audio_codec(), and
-ogmrip_plugin_find_subp_codec().

+Specifieѕ the type of functions passed to ogmrip_plugin_find_container(),
+ogmrip_plugin_find_video_codec(), ogmrip_plugin_find_audio_codec(), and
+ogmrip_plugin_find_subp_codec().

 

 
 

@@ -655,27 +669,27 @@
 
 
 
-type :
+
type :

  The type of the plugin
 
 
 
-name :
+
name :

  The name of the plugin
 
 
 
-description :
+
description :

  The description of the plugin
 
 
 
-data :
+
data :

  The user data
 
 
 
-Returns :
+
Returns :

  0 when the expected plugin is found
 
 
@@ -684,9 +698,8 @@
-

-ogmrip_plugin_init ()

-
void                ogmrip_plugin_init                  (void);
+

ogmrip_plugin_init ()

+
void                ogmrip_plugin_init                  (void);

Initializes the plugin system.

@@ -695,9 +708,8 @@

-

-ogmrip_plugin_uninit ()

-
void                ogmrip_plugin_uninit                (void);
+

ogmrip_plugin_uninit ()

+
void                ogmrip_plugin_uninit                (void);

Uninitializes the plugin system.

@@ -706,9 +718,8 @@

-

-ogmrip_plugin_get_n_containers ()

-
ogmrip_plugin_get_n_containers ()

+
gint                ogmrip_plugin_get_n_containers      (void);

 

@@ -719,7 +730,7 @@
 

-
+
@@ -727,9 +738,8 @@
 

-

-ogmrip_plugin_foreach_container ()

-
void                ogmrip_plugin_foreach_container     (OGMRipPluginFunc func,
+
ogmrip_plugin_foreach_container ()

+
void                ogmrip_plugin_foreach_container     (OGMRipPluginFunc func,
                                                          gpointer data);

@@ -742,12 +752,12 @@
 

-
+
-
+
@@ -756,11 +766,10 @@
 

-

-ogmrip_plugin_find_container ()

-
ogmrip_plugin_find_container ()

+
GType               ogmrip_plugin_find_container        (OGMRipPluginCmpFunc func,
+>GType               ogmrip_plugin_find_container        (OGMRipPluginCmpFunc func,
                                                          gconstpointer data);

@@ -773,18 +782,18 @@
 

-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -857,9 +864,8 @@
 

-

-ogmrip_plugin_get_container_index ()

-
ogmrip_plugin_get_container_index ()

+
gint                ogmrip_plugin_get_container_index   (
 

-
+
-
+
@@ -887,9 +893,8 @@
 
 

 

-

-ogmrip_plugin_get_container_bframes ()

-
ogmrip_plugin_get_container_bframes ()

+
gboolean            ogmrip_plugin_get_container_bframes (
 

-
+
-
+
-
+
-
+
@@ -950,9 +954,8 @@
 
 

 

-

-ogmrip_plugin_get_container_max_subp ()

-
ogmrip_plugin_get_container_max_subp ()

+
gint                ogmrip_plugin_get_container_max_subp
                                                         (
 

-
+
-
+
@@ -981,9 +984,39 @@
 
 

 

-

-ogmrip_plugin_get_n_video_codecs ()

-
ogmrip_plugin_get_container_by_name ()

+
GType               ogmrip_plugin_get_container_by_name (const gchar *name);

+

+Gets the container with the given name.

+

+
+

+

 
 
Returns :
Returns :

  the number of container plugins
 
 

 
 
 
 
func :
func :

  The function to call with each container plugin's data
 
 

 
data :
data :

  User data to pass to the function
 
 

 
 
 
 
func :
func :

  The function to call for each container plugin. It should return 0
 when the desired container is found
 
 

 
data :
data :

  User data passed to the function
 
 

 
Returns :
Returns :

  The type of the container, or G_TYPE_NONE
@@ -795,9 +804,8 @@
 
 

 

-

-ogmrip_plugin_get_nth_container ()

-
ogmrip_plugin_get_nth_container ()

+
GType               ogmrip_plugin_get_nth_container     (
 

 
n :
n :

  The index of the container
 
 

 
Returns :
Returns :

  The type of the container, or G_TYPE_NONE
@@ -827,9 +835,8 @@
 
 

 

-

-ogmrip_plugin_get_container_name ()

-
ogmrip_plugin_get_container_name ()

+
gchar*              ogmrip_plugin_get_container_name    (
 

 
container :
container :

  A container type
 
 

 
Returns :
Returns :

  The name of the container, or NULL 
 
 

 
 
 
container :
container :

  A container type
 
 

 
Returns :
Returns :

  The index of the container, or -1
 
 

 
container :
container :

  A container type
 
 

 
Returns :
Returns :

  TRUE if the container supports B-frames
@@ -919,9 +924,8 @@
 
 

 

-

-ogmrip_plugin_get_container_max_audio ()

-
ogmrip_plugin_get_container_max_audio ()

+
gint                ogmrip_plugin_get_container_max_audio
                                                         (
 

 
container :
container :

  A container type
 
 

 
Returns :
Returns :

  the number of audio streams, or -1
 
 

 
container :
container :

  A container type
 
 

 
Returns :
Returns :

  the number of subtitle streams, or -1
 
 

++
+
+
+
+
+
+
+
+
+
+


name :
 The name of the container
+
Returns :
 The type of the container, or G_TYPE_NONE
+

+
+
+
+

ogmrip_plugin_get_n_video_codecs ()

+
gint                ogmrip_plugin_get_n_video_codecs    (void);

@@ -994,7 +1027,7 @@

- + @@ -1002,9 +1035,8 @@
-

-ogmrip_plugin_foreach_video_codec ()

-
void                ogmrip_plugin_foreach_video_codec   (OGMRipPluginFunc func,
+
ogmrip_plugin_foreach_video_codec ()

+
void                ogmrip_plugin_foreach_video_codec   (OGMRipPluginFunc func,
                                                          gpointer data);

@@ -1017,12 +1049,12 @@
- + - + @@ -1031,11 +1063,10 @@
-

-ogmrip_plugin_find_video_codec ()

-
ogmrip_plugin_find_video_codec ()

+
GType               ogmrip_plugin_find_video_codec      (OGMRipPluginCmpFunc func,
+>GType               ogmrip_plugin_find_video_codec      (OGMRipPluginCmpFunc func,
                                                          gconstpointer data);

@@ -1048,18 +1079,18 @@
- + - + - + - + - + - + - + @@ -1132,9 +1161,8 @@
-

-ogmrip_plugin_get_video_codec_index ()

-
ogmrip_plugin_get_video_codec_index ()

+
gint                ogmrip_plugin_get_video_codec_index (
- + - + @@ -1162,9 +1190,8 @@
-

-ogmrip_plugin_get_video_codec_format ()

-
ogmrip_plugin_get_video_codec_format ()

+
gint                ogmrip_plugin_get_video_codec_format
                                                         (
- + - + @@ -1193,9 +1220,8 @@
-

-ogmrip_plugin_get_video_codec_passes ()

-
ogmrip_plugin_get_video_codec_passes ()

+
gint                ogmrip_plugin_get_video_codec_passes
                                                         (
- + - + @@ -1224,9 +1250,8 @@
-

-ogmrip_plugin_get_video_codec_threads ()

-
ogmrip_plugin_get_video_codec_threads ()

+
gint                ogmrip_plugin_get_video_codec_threads
                                                         (
- + - + @@ -1255,9 +1280,40 @@
-

-ogmrip_plugin_get_n_audio_codecs ()

-
ogmrip_plugin_get_video_codec_by_name ()

+
GType               ogmrip_plugin_get_video_codec_by_name
+                                                        (const gchar *name);

+

+Gets the video codec with the given name.

+

+
+

+
Returns :

Returns :

 the number of video codec plugins
func :

func :

 The function to call with each video codec plugin's data
data :

data :

 User data to pass to the function
func :

func :

 The function to call for each video codec plugin. It should return 0 when the desired video codec is found
data :

data :

 User data passed to the function
Returns :

Returns :

 The type of the video codec, or G_TYPE_NONE @@ -1070,9 +1101,8 @@
-

-ogmrip_plugin_get_nth_video_codec ()

-
ogmrip_plugin_get_nth_video_codec ()

+
GType               ogmrip_plugin_get_nth_video_codec   (
n :

n :

 The index of the video codec
Returns :

Returns :

 The type of the video codec, or G_TYPE_NONE @@ -1102,9 +1132,8 @@
-

-ogmrip_plugin_get_video_codec_name ()

-
ogmrip_plugin_get_video_codec_name ()

+
gchar*              ogmrip_plugin_get_video_codec_name  (
codec :

codec :

 A video codec type
Returns :

Returns :

 The name of the video codec, or NULL
codec :

codec :

 A video codec type
Returns :

Returns :

 The index of the video codec, or -1
codec :

codec :

 A video codec type
Returns :

Returns :

 The format of the video codec, or NULL
codec :

codec :

 A video codec type
Returns :

Returns :

 The maximum number of passes, or -1
codec :

codec :

 A video codec type
Returns :

Returns :

 The maximum number of threads, or -1
++ + + + + + + + + + +

name :

 The name of the video codec +

Returns :

 The type of the video codec, or G_TYPE_NONE +
+
+
+
+

ogmrip_plugin_get_n_audio_codecs ()

+
gint                ogmrip_plugin_get_n_audio_codecs    (void);

@@ -1268,7 +1324,7 @@

- + @@ -1276,9 +1332,8 @@
-

-ogmrip_plugin_foreach_audio_codec ()

-
void                ogmrip_plugin_foreach_audio_codec   (OGMRipPluginFunc func,
+
ogmrip_plugin_foreach_audio_codec ()

+
void                ogmrip_plugin_foreach_audio_codec   (OGMRipPluginFunc func,
                                                          gpointer data);

@@ -1291,12 +1346,12 @@
- + - + @@ -1305,11 +1360,10 @@
-

-ogmrip_plugin_find_audio_codec ()

-
ogmrip_plugin_find_audio_codec ()

+
GType               ogmrip_plugin_find_audio_codec      (OGMRipPluginCmpFunc func,
+>GType               ogmrip_plugin_find_audio_codec      (OGMRipPluginCmpFunc func,
                                                          gconstpointer data);

@@ -1322,18 +1376,18 @@
- + - + - + - + - + - + - + @@ -1406,9 +1458,8 @@
-

-ogmrip_plugin_get_audio_codec_index ()

-
ogmrip_plugin_get_audio_codec_index ()

+
gint                ogmrip_plugin_get_audio_codec_index (
- + - + @@ -1436,9 +1487,8 @@
-

-ogmrip_plugin_get_audio_codec_format ()

-
ogmrip_plugin_get_audio_codec_format ()

+
gint                ogmrip_plugin_get_audio_codec_format
                                                         (
- + - + @@ -1467,9 +1517,40 @@
-

-ogmrip_plugin_get_n_subp_codecs ()

-
ogmrip_plugin_get_audio_codec_by_name ()

+
GType               ogmrip_plugin_get_audio_codec_by_name
+                                                        (const gchar *name);

+

+Gets the audio codec with the given name.

+

+
+

+
Returns :

Returns :

 the number of audio codec plugins
func :

func :

 The function to call with each plugin's data
data :

data :

 User data to pass to the function
func :

func :

 The function to call for each audio codec plugin. It should return 0 when the desired audio codec is found
data :

data :

 User data passed to the function
Returns :

Returns :

 The type of the audio codec, or G_TYPE_NONE @@ -1344,9 +1398,8 @@
-

-ogmrip_plugin_get_nth_audio_codec ()

-
ogmrip_plugin_get_nth_audio_codec ()

+
GType               ogmrip_plugin_get_nth_audio_codec   (
n :

n :

 The index of the audio codec
Returns :

Returns :

 The type of the audio codec, or G_TYPE_NONE @@ -1376,9 +1429,8 @@
-

-ogmrip_plugin_get_audio_codec_name ()

-
ogmrip_plugin_get_audio_codec_name ()

+
gchar*              ogmrip_plugin_get_audio_codec_name  (
codec :

codec :

 An audio codec type
Returns :

Returns :

 The name of the audio codec, or NULL
codec :

codec :

 An audio codec type
Returns :

Returns :

 The index of the audio codec, or -1
codec :

codec :

 A audio codec type
Returns :

Returns :

 The format of the audio codec, or NULL
++ + + + + + + + + + +

name :

 The name of the audio codec +

Returns :

 The type of the audio codec, or G_TYPE_NONE +
+
+
+
+

ogmrip_plugin_get_n_subp_codecs ()

+
gint                ogmrip_plugin_get_n_subp_codecs     (void);

@@ -1480,7 +1561,7 @@

- + @@ -1488,9 +1569,8 @@
-

-ogmrip_plugin_foreach_subp_codec ()

-
void                ogmrip_plugin_foreach_subp_codec    (OGMRipPluginFunc func,
+
ogmrip_plugin_foreach_subp_codec ()

+
void                ogmrip_plugin_foreach_subp_codec    (OGMRipPluginFunc func,
                                                          gpointer data);

@@ -1503,12 +1583,12 @@
- + - + @@ -1517,11 +1597,10 @@
-

-ogmrip_plugin_find_subp_codec ()

-
ogmrip_plugin_find_subp_codec ()

+
GType               ogmrip_plugin_find_subp_codec       (OGMRipPluginCmpFunc func,
+>GType               ogmrip_plugin_find_subp_codec       (OGMRipPluginCmpFunc func,
                                                          gconstpointer data);

@@ -1534,18 +1613,18 @@
- + - + - + - + - + - + - + @@ -1618,9 +1695,8 @@
-

-ogmrip_plugin_get_subp_codec_index ()

-
ogmrip_plugin_get_subp_codec_index ()

+
gint                ogmrip_plugin_get_subp_codec_index  (
- + - + @@ -1648,9 +1724,8 @@
-

-ogmrip_plugin_get_subp_codec_format ()

-
ogmrip_plugin_get_subp_codec_format ()

+
gint                ogmrip_plugin_get_subp_codec_format (
- + - + @@ -1678,9 +1753,8 @@
-

-ogmrip_plugin_get_subp_codec_text ()

-
ogmrip_plugin_get_subp_codec_text ()

+
gboolean            ogmrip_plugin_get_subp_codec_text   (
- + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - +
Returns :

Returns :

 the number of subtitle codec plugins
func :

func :

 The function to call with each plugin's data
data :

data :

 User data to pass to the function
func :

func :

 The function to call for each subtitle codec plugin. It should return 0 when the desired subtitle codec is found
data :

data :

 User data passed to the function
Returns :

Returns :

 The type of the subtitle codec, or G_TYPE_NONE @@ -1556,9 +1635,8 @@
-

-ogmrip_plugin_get_nth_subp_codec ()

-
ogmrip_plugin_get_nth_subp_codec ()

+
GType               ogmrip_plugin_get_nth_subp_codec    (
n :

n :

 The index of the subtitle codec
Returns :

Returns :

 The type of the subtitle codec, or G_TYPE_NONE @@ -1588,9 +1666,8 @@
-

-ogmrip_plugin_get_subp_codec_name ()

-
ogmrip_plugin_get_subp_codec_name ()

+
gchar*              ogmrip_plugin_get_subp_codec_name   (
codec :

codec :

 A subtitle codec type
Returns :

Returns :

 The name of the subtitle codec, or NULL
codec :

codec :

 A subtitle codec type
Returns :

Returns :

 The index of the subtitle codec, or -1
codec :

codec :

 A subtitle codec type
Returns :

Returns :

 The format of the subtitle codec, or NULL
codec :

codec :

 A subtitle codec type
Returns :

Returns :

 TRUE if the codec output text subtitles @@ -1710,9 +1784,40 @@
-

-ogmrip_plugin_can_contain_video ()

-
ogmrip_plugin_get_subp_codec_by_name ()

+
GType               ogmrip_plugin_get_subp_codec_by_name
+                                                        (const gchar *name);

+

+Gets the subp codec with the given name.

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+


name :
 The name of the subp codec
+
Returns :
 The type of the subp codec, or G_TYPE_NONE
+

+
+
+
+

ogmrip_plugin_can_contain_video ()

+
gboolean            ogmrip_plugin_can_contain_video     (
container :

container :

 A container type
codec :

codec :

 A video codec type
Returns :

Returns :

 TRUE if container supports type @@ -1750,9 +1855,8 @@
-

-ogmrip_plugin_can_contain_audio ()

-
ogmrip_plugin_can_contain_audio ()

+
gboolean            ogmrip_plugin_can_contain_audio     (
container :

container :

 A container type
codec :

codec :

 An audio codec type
Returns :

Returns :

 TRUE if container supports type @@ -1790,9 +1894,8 @@
-

-ogmrip_plugin_can_contain_subp ()

-
ogmrip_plugin_can_contain_subp ()

+
gboolean            ogmrip_plugin_can_contain_subp      (
container :

container :

 A container type
codec :

codec :

 A subtitle codec type
Returns :

Returns :

 TRUE if container supports type @@ -1830,14 +1933,13 @@
-

-ogmrip_plugin_can_contain_format ()

-
ogmrip_plugin_can_contain_format ()

+
gboolean            ogmrip_plugin_can_contain_format    (GType container,
-                                                         OGMRipFormatType format);

+                                                         OGMRipFormatType format);

Returns whether container supports the given format.

@@ -1847,17 +1949,17 @@

container :

container :

 A container type
format : An OGMRipFormatType +

format :

 An OGMRipFormatType
Returns :

Returns :

 TRUE if container supports format @@ -1868,9 +1970,8 @@
-

-ogmrip_plugin_can_contain_n_audio ()

-
ogmrip_plugin_can_contain_n_audio ()

+
gboolean            ogmrip_plugin_can_contain_n_audio   (
container :

container :

 A container type
ncodec :

ncodec :

 The number of audio codecs
Returns :

Returns :

 TRUE if container can contain ncodec audio streams @@ -1908,9 +2009,8 @@
-

-ogmrip_plugin_can_contain_n_subp ()

-
ogmrip_plugin_can_contain_n_subp ()

+
gboolean            ogmrip_plugin_can_contain_n_subp    (
container :

container :

 A container type
ncodec :

ncodec :

 The number of subtitle codecs
Returns :

Returns :

 TRUE if container can contain ncodec subtitle streams @@ -1948,5 +2048,8 @@ +
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipSrt.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipSrt.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipSrt.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipSrt.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipSrt - + - + - - + + - + @@ -29,52 +29,45 @@ 		OGMRip Reference Manual Next
Top -  |  - Description
Top +  |  + Description
-

-OGMRipSrt -

-

OGMRipSrt — A subtitles codec to extract in SubRip Text

+

OGMRipSrt

+

OGMRipSrt — A subtitles codec to extract in SubRip Text
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipSrt;
+                    OGMRipSrt;
 OGMJobSpawn*        ogmrip_srt_new                      (OGMJobSpawn*        ogmrip_srt_new                      (OGMDvdSubpStream *subp,
                                                          const gchar *output);
-
-

Description

+

Description

-

Details

+

Details

-

-OGMRipSrt

-
typedef struct {
-  OGMRipSubp parent_instance;
+
OGMRipSrt

+
typedef struct {
+  OGMRipSubpCodec parent_instance;
 
   OGMRipSrtPriv *priv;
 } OGMRipSrt;
@@ -85,18 +78,17 @@
-

-ogmrip_srt_new ()

-
ogmrip_srt_new ()

+
OGMJobSpawn*        ogmrip_srt_new                      (OGMDvdSubpStream *subp,
                                                          const gchar *output);

 

-Creates a new OGMRipSrt.

+Creates a new OGMRipSrt.

 

 
 

@@ -104,20 +96,20 @@
 
 
 
-subp :
+
subp :

  An OGMDvdSubpStream
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- The new OGMRipSrt
+
Returns :

+ The new OGMRipSrt
 
 
 
@@ -125,5 +117,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipTheora.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipTheora.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipTheora.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipTheora.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipTheora - + - + - + - - + + - + @@ -23,60 +23,51 @@ - + - +
-

-OGMRipTheora -

-

OGMRipTheora — A video codec to encode in theora

+

OGMRipTheora

+

OGMRipTheora — A video codec to encode in theora
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipTheora;
+                    OGMRipTheora;
 OGMJobSpawn*        ogmrip_theora_new                   (OGMJobSpawn*        ogmrip_theora_new                   (OGMDvdTitle *title,
                                                          const gchar *output);
-
-

Description

+

Description

-

Details

+

Details

-

-OGMRipTheora

-
typedef struct {
-  OGMRipVideo parent_instance;
-
-  OGMRipTheoraPriv *priv;
+
OGMRipTheora

+
typedef struct {
+  OGMRipVideoCodec parent_instance;
 } OGMRipTheora;
 

 

@@ -85,18 +76,17 @@
-

-ogmrip_theora_new ()

-
ogmrip_theora_new ()

+
OGMJobSpawn*        ogmrip_theora_new                   (OGMDvdTitle *title,
                                                          const gchar *output);

 

-Creates a new OGMRipTheora.

+Creates a new OGMRipTheora.

 

 
 

@@ -104,20 +94,20 @@
 
 
 
-title :
+
title :

  An OGMDvdTitle
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- The new OGMRipTheora
+
Returns :

+ The new OGMRipTheora
 
 
 
@@ -125,5 +115,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-ogmrip-version.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-ogmrip-version.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-ogmrip-version.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-ogmrip-version.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + Version information - + - - + + - + - - + + - + @@ -29,134 +29,209 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-Version information -

-

Version information — Variables and functions to check the OGMRip and MPlayer versions

+

Version information

+

Version information — Variables and functions to check the OGMRip and MPlayer versions
-

Synopsis

+

Synopsis

-
-
-
-#define             OGMRIP_MAJOR_VERSION
-#define             OGMRIP_MINOR_VERSION
-#define             OGMRIP_MICRO_VERSION
-#define             MPLAYER_MAJOR_VERSION
-#define             MPLAYER_MINOR_VERSION
-#define             MPLAYER_PRE_VERSION
-#define             MPLAYER_RC_VERSION
-#define             OGMRIP_CHECK_VERSION                (major,minor,micro)
-#define             MPLAYER_CHECK_VERSION               (major,minor,rc,pre)
+gboolean            ogmrip_check_mencoder               (void);
+gboolean            ogmrip_check_mplayer                (void);
+gboolean            ogmrip_check_mplayer_dts            (void);
+gboolean            ogmrip_check_mplayer_version        (gint major,
+                                                         gint minor,
+                                                         gint rc,
+                                                         gint pre);
+#define             OGMRIP_MAJOR_VERSION
+#define             OGMRIP_MINOR_VERSION
+#define             OGMRIP_MICRO_VERSION
+#define             OGMRIP_CHECK_VERSION                (major,minor,micro)
+#define             MPLAYER_CHECK_VERSION               (major,minor,rc,pre)
-

Description

+

Description

-

Details

+

Details

-

-OGMRIP_MAJOR_VERSION

-
#define OGMRIP_MAJOR_VERSION       (0)
-
+

ogmrip_check_mencoder ()

+
gboolean            ogmrip_check_mencoder               (void);

-Compile time major version of OGMRip

+Checks if mencoder is installed.

+
++ + + + +

Returns :

 TRUE if mencoder is installed +
-

-OGMRIP_MINOR_VERSION

-
#define OGMRIP_MINOR_VERSION       (11)
-
+

ogmrip_check_mplayer ()

+
gboolean            ogmrip_check_mplayer                (void);

-Compile time minor version of OGMRip

+Checks if mplayer is installed.

+
++ + + + +

Returns :

 TRUE if mplayer is installed +
-

-OGMRIP_MICRO_VERSION

-
#define OGMRIP_MICRO_VERSION       (1)
-
+

ogmrip_check_mplayer_dts ()

+
gboolean            ogmrip_check_mplayer_dts            (void);

-Compile time micro version of OGMRip

+Checks if mplayer has DTS support.

+
++ + + + +

Returns :

 TRUE if DTS is supported +
-

-MPLAYER_MAJOR_VERSION

-
#define MPLAYER_MAJOR_VERSION      (99)
-
+

ogmrip_check_mplayer_version ()

+
gboolean            ogmrip_check_mplayer_version        (gint major,
+                                                         gint minor,
+                                                         gint rc,
+                                                         gint pre);

-Compile time major version of MPlayer

+Checks if the version of mplayer is older than a given version.

+
++ + + + + + + + + + + + + + + + + + + + + + +

major :

 The major version number +

minor :

 The minor version number +

rc :

 The release candidate version number, or 0 if none +

pre :

 The pre-release version number, or 0 if none +

Returns :

 TRUE if the version is older +
-

-MPLAYER_MINOR_VERSION

-
#define MPLAYER_MINOR_VERSION      (99)
+
OGMRIP_MAJOR_VERSION

+
#define OGMRIP_MAJOR_VERSION       (0)
 

 

-Compile time minor version of MPlayer

+Compile time major version of OGMRip
-

-MPLAYER_PRE_VERSION

-
#define MPLAYER_PRE_VERSION        (99)
+
OGMRIP_MINOR_VERSION

+
#define OGMRIP_MINOR_VERSION       (12)
 

 

-Compile time pre version of MPlayer

+Compile time minor version of OGMRip
-

-MPLAYER_RC_VERSION

-
#define MPLAYER_RC_VERSION         (99)
+
OGMRIP_MICRO_VERSION

+
#define OGMRIP_MICRO_VERSION       (2)
 

 

-Compile time rc version of MPlayer

+Compile time micro version of OGMRip
-

-OGMRIP_CHECK_VERSION()

-
#define             OGMRIP_CHECK_VERSION(major,minor,micro)
+

OGMRIP_CHECK_VERSION()

+
#define             OGMRIP_CHECK_VERSION(major,minor,micro)

Checks whether version is equal or greather than major.minor.micro

@@ -166,17 +241,17 @@ -major : +

major :

A major version number -minor : +

minor :

A minor version number -micro : +

micro :

A micro version number @@ -185,9 +260,8 @@
-

-MPLAYER_CHECK_VERSION()

-
#define             MPLAYER_CHECK_VERSION(major,minor,rc,pre)
+

MPLAYER_CHECK_VERSION()

+
#define             MPLAYER_CHECK_VERSION(major,minor,rc,pre)

Check if version is equal or greather than major.minor, major.minor-rc or major.minor-pre, in that order

@@ -198,22 +272,22 @@ -major : +

major :

A major version number -minor : +

minor :

A minor version number -rc : +

rc :

An rc version number -pre : +

pre :

A pre version number @@ -222,5 +296,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipVobSub.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipVobSub.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipVobSub.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipVobSub.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,19 +1,19 @@ - + OGMRipVobSub - + - + - - + + - + @@ -26,56 +26,47 @@ Up Home OGMRip Reference Manual -  +  -Top -  |  - Description +Top +  |  + Description
-

-OGMRipVobSub -

-

OGMRipVobSub — A subtitles codec to extract in VobSub

+

OGMRipVobSub

+

OGMRipVobSub — A subtitles codec to extract in VobSub
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipVobSub;
+                    OGMRipVobSub;
 OGMJobSpawn*        ogmrip_vobsub_new                   (OGMJobSpawn*        ogmrip_vobsub_new                   (OGMDvdSubpStream *subp,
                                                          const gchar *output);
-
-

Description

+

Description

-

Details

+

Details

-

-OGMRipVobSub

-
typedef struct {
-  OGMRipSubp parent_instance;
-
-  OGMRipVobSubPriv *priv;
+
OGMRipVobSub

+
typedef struct {
+  OGMRipSubpCodec parent_instance;
 } OGMRipVobSub;
 

 

@@ -84,18 +75,17 @@
-

-ogmrip_vobsub_new ()

-
ogmrip_vobsub_new ()

+
OGMJobSpawn*        ogmrip_vobsub_new                   (OGMDvdSubpStream *subp,
                                                          const gchar *output);

 

-Creates a new OGMRipVobSub.

+Creates a new OGMRipVobSub.

 

 
 

@@ -103,20 +93,20 @@
 
 
 
-subp :
+
subp :

  An OGMDvdSubpStream
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- The new OGMRipVobSub
+
Returns :

+ The new OGMRipVobSub
 
 
 
@@ -124,5 +114,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipVorbis.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipVorbis.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipVorbis.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipVorbis.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipVorbis - + - + - - + + - + @@ -29,54 +29,45 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-OGMRipVorbis -

-

OGMRipVorbis — An audio codec to encode in Ogg Vorbis

+

OGMRipVorbis

+

OGMRipVorbis — An audio codec to encode in Ogg Vorbis
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipVorbis;
+                    OGMRipVorbis;
 OGMJobSpawn*        ogmrip_vorbis_new                   (OGMJobSpawn*        ogmrip_vorbis_new                   (OGMDvdAudioStream *audio,
                                                          const gchar *output);
-
-

Description

+

Description

-

Details

+

Details

-

-OGMRipVorbis

-
typedef struct {
-  OGMRipAudio parent_instance;
-
-  OGMRipVorbisPriv *priv;
+
OGMRipVorbis

+
typedef struct {
+  OGMRipAudioCodec parent_instance;
 } OGMRipVorbis;
 

 

@@ -85,18 +76,17 @@
-

-ogmrip_vorbis_new ()

-
ogmrip_vorbis_new ()

+
OGMJobSpawn*        ogmrip_vorbis_new                   (OGMDvdAudioStream *audio,
                                                          const gchar *output);

 

-Creates a new OGMRipVorbis.

+Creates a new OGMRipVorbis.

 

 
 

@@ -104,20 +94,20 @@
 
 
 
-audio :
+
audio :

  An OGMDvdAudioStream
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- The new OGMRipVorbis
+
Returns :

+ The new OGMRipVorbis
 
 
 
@@ -125,5 +115,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipWav.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipWav.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipWav.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipWav.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipWav - + - + - - + + - + @@ -29,59 +29,52 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-OGMRipWav -

-

OGMRipWav — An audio codec to encode in wav

+

OGMRipWav

+

OGMRipWav — An audio codec to encode in wav
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipWav;
+                    OGMRipWav;
 OGMJobSpawn*        ogmrip_wav_new                      (OGMJobSpawn*        ogmrip_wav_new                      (OGMDvdAudioStream *audio,
                                                          const gchar *output);
-void                ogmrip_wav_set_header               (OGMRipWav *wav,
+void                ogmrip_wav_set_header               (OGMRipWav *wav,
                                                          gboolean header);
 gboolean            ogmrip_wav_get_header               (OGMRipWav *wav);
-
+>gboolean            ogmrip_wav_get_header               (OGMRipWav *wav);
-

Description

+

Description

-

Details

+

Details

-

-OGMRipWav

-
typedef struct {
-  OGMRipAudio parent_instance;
+
OGMRipWav

+
typedef struct {
+  OGMRipAudioCodec parent_instance;
 
   OGMRipWavPriv *priv;
 } OGMRipWav;
@@ -92,18 +85,17 @@
-

-ogmrip_wav_new ()

-
ogmrip_wav_new ()

+
OGMJobSpawn*        ogmrip_wav_new                      (OGMDvdAudioStream *audio,
                                                          const gchar *output);

 

-Creates a new OGMRipWav

+Creates a new OGMRipWav

 

 
 

@@ -111,20 +103,20 @@
 
 
 
-audio :
+
audio :

  An OGMDvdAudioStream
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- The new OGMRipWav
+
Returns :

+ The new OGMRipWav
 
 
 
@@ -132,9 +124,8 @@
-

-ogmrip_wav_set_header ()

-
void                ogmrip_wav_set_header               (OGMRipWav *wav,
+
ogmrip_wav_set_header ()

+
void                ogmrip_wav_set_header               (OGMRipWav *wav,
                                                          gboolean header);

@@ -147,12 +138,12 @@
 
 
 
-wav :
- An OGMRipWav
+
wav :

+ An OGMRipWav
 
 
 
-header :
+
header :

  TRUE to have the header
@@ -163,11 +154,10 @@
-

-ogmrip_wav_get_header ()

-
ogmrip_wav_get_header ()

+
gboolean            ogmrip_wav_get_header               (OGMRipWav *wav);

+>gboolean            ogmrip_wav_get_header               (OGMRipWav *wav);

Gets whether to include the wave header.

@@ -177,12 +167,12 @@ -wav : - An OGMRipWav +

wav :

+ An OGMRipWav -Returns : +

Returns :

TRUE to include the header @@ -193,5 +183,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipX264.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipX264.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipX264.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipX264.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipX264 - + - + - - + + - + @@ -29,52 +29,45 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-OGMRipX264 -

-

OGMRipX264 — A video codec to encode in X264

+

OGMRipX264

+

OGMRipX264 — A video codec to encode in X264
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipX264;
+                    OGMRipX264;
 OGMJobSpawn*        ogmrip_x264_new                     (OGMJobSpawn*        ogmrip_x264_new                     (OGMDvdTitle *title,
                                                          const gchar *output);
-
-

Description

+

Description

-

Details

+

Details

-

-OGMRipX264

-
typedef struct {
-  OGMRipVideo parent_instance;
+
OGMRipX264

+
typedef struct {
+  OGMRipVideoCodec parent_instance;
 
   OGMRipX264Priv *priv;
 } OGMRipX264;
@@ -85,18 +78,17 @@
-

-ogmrip_x264_new ()

-
ogmrip_x264_new ()

+
OGMJobSpawn*        ogmrip_x264_new                     (OGMDvdTitle *title,
                                                          const gchar *output);

 

-Creates a new OGMRipX264.

+Creates a new OGMRipX264.

 

 
 

@@ -104,20 +96,20 @@
 
 
 
-title :
+
title :

  An OGMDvdTitle
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- the new OGMRipX264
+
Returns :

+ the new OGMRipX264
 
 
 
@@ -125,5 +117,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipXvid.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipXvid.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-OGMRipXvid.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-OGMRipXvid.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + OGMRipXvid - + - + - - + + - + @@ -29,59 +29,52 @@ OGMRip Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-OGMRipXvid -

-

OGMRipXvid — A video codec to encode in XviD

+

OGMRipXvid

+

OGMRipXvid — A video codec to encode in XviD
-

Synopsis

+

Synopsis

-
-
-
-                    OGMRipXvid;
+                    OGMRipXvid;
 OGMJobSpawn*        ogmrip_xvid_new                     (OGMJobSpawn*        ogmrip_xvid_new                     (OGMDvdTitle *title,
                                                          const gchar *output);
-void                ogmrip_xvid_set_gmc                 (OGMRipXvid *xvid,
+void                ogmrip_xvid_set_gmc                 (OGMRipXvid *xvid,
                                                          gboolean gmc);
 gboolean            ogmrip_xvid_get_gmc                 (OGMRipXvid *xvid);
-
+>gboolean            ogmrip_xvid_get_gmc                 (OGMRipXvid *xvid);
-

Description

+

Description

-

Details

+

Details

-

-OGMRipXvid

-
typedef struct {
-  OGMRipVideo parent_instance;
+
OGMRipXvid

+
typedef struct {
+  OGMRipVideoCodec parent_instance;
 
   OGMRipXvidPriv *priv;
 } OGMRipXvid;
@@ -92,18 +85,17 @@
-

-ogmrip_xvid_new ()

-
ogmrip_xvid_new ()

+
OGMJobSpawn*        ogmrip_xvid_new                     (OGMDvdTitle *title,
                                                          const gchar *output);

 

-Creates a new OGMRipXvid.

+Creates a new OGMRipXvid.

 

 
 

@@ -111,20 +103,20 @@
 
 
 
-title :
+
title :

  An OGMDvdTitle
 
 
 
-output :
+
output :

  The output file
 
 
 
-Returns :
- the new OGMRipXvid
+
Returns :

+ the new OGMRipXvid
 
 
 
@@ -132,9 +124,8 @@
-

-ogmrip_xvid_set_gmc ()

-
void                ogmrip_xvid_set_gmc                 (OGMRipXvid *xvid,
+
ogmrip_xvid_set_gmc ()

+
void                ogmrip_xvid_set_gmc                 (OGMRipXvid *xvid,
                                                          gboolean gmc);

@@ -147,12 +138,12 @@
 
 
 
-xvid :
- An OGMRipXvid
+
xvid :

+ An OGMRipXvid
 
 
 
-gmc :
+
gmc :

  TRUE to set global motion compensation
@@ -163,11 +154,10 @@
-

-ogmrip_xvid_get_gmc ()

-
ogmrip_xvid_get_gmc ()

+
gboolean            ogmrip_xvid_get_gmc                 (OGMRipXvid *xvid);

+>gboolean            ogmrip_xvid_get_gmc                 (OGMRipXvid *xvid);

Gets global motion compensation.

@@ -177,12 +167,12 @@ -xvid : - An OGMRipXvid +

xvid :

+ An OGMRipXvid -Returns : +

Returns :

TRUE if global motion compensation has been set @@ -193,5 +183,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-plugin.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-plugin.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-plugin.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-plugin.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - -Part III. OGMRip Plugins - + +Part III. OGMRip Plugins + - + - - + + - + @@ -23,19 +23,84 @@ - +

-Part III. OGMRip Plugins

+Part III. OGMRip Plugins

This section contains the API reference for OGMRip. All the public interfaces are documented here.

+
+

Table of Contents

+
+
Containers
+
+
+OGMRipAvi — The AVI container +
+
+OGMRipMatroska — The Matroska container +
+
+OGMRipMp4 — The MP4 container +
+
+OGMRipOgg — The Ogg Media container +
+
+
Video Codecs
+
+
+OGMRipLavcMpeg4 +
+
+OGMRipTheora — A video codec to encode in theora +
+
+OGMRipX264 — A video codec to encode in X264 +
+
+OGMRipXvid — A video codec to encode in XviD +
+
+
Audio Codecs
+
+
+OGMRipAac — An audio codec to encode in AAC +
+
+OGMRipMp3 — An audio codec to encode in MP3 +
+
+OGMRipVorbis — An audio codec to encode in Ogg Vorbis +
+
+OGMRipWav — An audio codec to encode in wav +
+
+OGMRipAudioCopy — A codec to copy an audio stream +
+
+
Subtitles Codecs
+
+
+OGMRipSrt — A subtitles codec to extract in SubRip Text +
+
+OGMRipVobSub — A subtitles codec to extract in VobSub +
+
+
+
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-ref.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-ref.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/ogmrip-ref.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/ogmrip-ref.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - -Part I. OGMRip Core Reference - + +Part I. OGMRip Core Reference + - + - - + + - + @@ -23,12 +23,43 @@ - + -

-Part I. OGMRip Core Reference

+
+

+Part I. OGMRip Core Reference

+
+

Table of Contents

+
+
+Version information — Variables and functions to check the OGMRip and MPlayer versions +
+
+Enumerations — Public enumerated types used throughout OGMRip +
+
+Plugins System — Functions for manipulating the plugins +
+
+Edit Decision List — Functions for manipulating EDL +
+
+Filesystem — Functions for handling files, directories, links and fifos +
+
+Files — Structures to manipulate media files +
+
+Mplayer — Common wrapper functions for mplayer and mencoder +
+
+
+
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipSubpCodec.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipSubpCodec.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipSubpCodec.html 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipSubpCodec.html 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,408 @@ + + + + +OGMRipSubpCodec + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

OGMRipSubpCodec

+

OGMRipSubpCodec — Base class for subtitles codecs

+
+
+

Synopsis

+
+
+#include <ogmrip-subp-codec.h>
+
+                    OGMRipSubpCodec;
+void                ogmrip_subp_codec_set_dvd_subp_stream
+                                                        (OGMRipSubpCodec *subp,
+                                                         OGMDvdSubpStream *stream);
+OGMDvdSubpStream*   ogmrip_subp_codec_get_dvd_subp_stream
+                                                        (OGMRipSubpCodec *subp);
+gint                ogmrip_subp_codec_get_charset       (OGMRipSubpCodec *subp);
+void                ogmrip_subp_codec_set_charset       (OGMRipSubpCodec *subp,
+                                                         OGMRipCharset charset);
+gint                ogmrip_subp_codec_get_eol_style     (OGMRipSubpCodec *subp);
+void                ogmrip_subp_codec_set_eol_style     (OGMRipSubpCodec *subp,
+                                                         OGMRipEolStyle eol);
+gboolean            ogmrip_subp_codec_get_forced_only   (OGMRipSubpCodec *subp);
+void                ogmrip_subp_codec_set_forced_only   (OGMRipSubpCodec *subp,
+                                                         gboolean forced_only);
+
+
+
+

Object Hierarchy

+
+  GObject
+   +----OGMJobSpawn
+         +----OGMJobContainer
+               +----OGMJobBin
+                     +----OGMRipCodec
+                           +----OGMRipSubpCodec
+
+
+
+

Properties

+
+  "charset"                  guint                 : Read / Write
+  "eol"                      guint                 : Read / Write
+  "forced-only"              gboolean              : Read / Write
+  "stream"                   gpointer              : Read / Write
+
+
+
+

Description

+

+

+

+ +

+
+
+

Details

+
+

OGMRipSubpCodec

+
typedef struct _OGMRipSubpCodec OGMRipSubpCodec;
+

+ +

+
+
+
+

ogmrip_subp_codec_set_dvd_subp_stream ()

+
void                ogmrip_subp_codec_set_dvd_subp_stream
+                                                        (OGMRipSubpCodec *subp,
+                                                         OGMDvdSubpStream *stream);
+

+Sets the subtitle stream to encode.

+

+ +

+
++ + + + + + + + + + +

subp :

 an OGMRipSubpCodec +

stream :

 an OGMDvdSubpStream +
+
+
+
+

ogmrip_subp_codec_get_dvd_subp_stream ()

+
OGMDvdSubpStream*   ogmrip_subp_codec_get_dvd_subp_stream
+                                                        (OGMRipSubpCodec *subp);
+

+Gets the subtitle stream to encode.

+

+ +

+
++ + + + + + + + + + +

subp :

 an OGMRipSubpCodec +

Returns :

 an OGMDvdSubpStream, or NULL +
+
+
+
+

ogmrip_subp_codec_get_charset ()

+
gint                ogmrip_subp_codec_get_charset       (OGMRipSubpCodec *subp);
+

+Gets the character set of text subtitles

+

+ +

+
++ + + + + + + + + + +

subp :

 an OGMRipSubpCodec +

Returns :

 an OGMRipCharset, or -1 +
+
+
+
+

ogmrip_subp_codec_set_charset ()

+
void                ogmrip_subp_codec_set_charset       (OGMRipSubpCodec *subp,
+                                                         OGMRipCharset charset);
+

+Sets the character set of text subtitles

+

+ +

+
++ + + + + + + + + + +

subp :

 an OGMRipSubpCodec +

charset :

 the OGMRipCharset +
+
+
+
+

ogmrip_subp_codec_get_eol_style ()

+
gint                ogmrip_subp_codec_get_eol_style     (OGMRipSubpCodec *subp);
+

+Gets the end-of-line characters of text subtitles

+

+ +

+
++ + + + + + + + + + +

subp :

 an OGMRipSubpCodec +

Returns :

 the OGMRipEolStyle, or -1 +
+
+
+
+

ogmrip_subp_codec_set_eol_style ()

+
void                ogmrip_subp_codec_set_eol_style     (OGMRipSubpCodec *subp,
+                                                         OGMRipEolStyle eol);
+

+Sets the end-of-line characters of text subtitles

+

+ +

+
++ + + + + + + + + + +

subp :

 an OGMRipSubpCodec +

eol :

 the OGMRipEolStyle +
+
+
+
+

ogmrip_subp_codec_get_forced_only ()

+
gboolean            ogmrip_subp_codec_get_forced_only   (OGMRipSubpCodec *subp);
+

+Gets whether to extract forced subtitles only.

+

+ +

+
++ + + + + + + + + + +

subp :

 an OGMRipSubpCodec +

Returns :

 TRUE to extract forced subtitles only +
+
+
+
+

ogmrip_subp_codec_set_forced_only ()

+
void                ogmrip_subp_codec_set_forced_only   (OGMRipSubpCodec *subp,
+                                                         gboolean forced_only);
+

+Sets whether to extract forced subtitles only.

+

+ +

+
++ + + + + + + + + + +

subp :

 an OGMRipSubpCodec +

forced_only :

 TRUE to extract forced subtitles only +
+
+
+
+

Property Details

+
+

The "charset" property

+
  "charset"                  guint                 : Read / Write
+

Set charset.

+

Allowed values: <= 2

+

Default value: 0

+
+
+
+

The "eol" property

+
  "eol"                      guint                 : Read / Write
+

Set end of line style.

+

Allowed values: <= 1

+

Default value: 0

+
+
+
+

The "forced-only" property

+
  "forced-only"              gboolean              : Read / Write
+

Set forced only.

+

Default value: FALSE

+
+
+
+

The "stream" property

+
  "stream"                   gpointer              : Read / Write
+

Set subp stream.

+
+
+
+
+
+ Generated by GTK-Doc V1.10
+ + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipSubp.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipSubp.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipSubp.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipSubp.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,420 +0,0 @@ - - - - -OGMRipSubp - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

-OGMRipSubp -

-

OGMRipSubp — Base class for subtitles codecs

-
-
-

Synopsis

-
-
-#include <ogmrip-subp.h>
-
-
-                    OGMRipSubp;
-void                ogmrip_subp_set_dvd_subp_stream     (OGMRipSubp *subp,
-                                                         OGMDvdSubpStream *stream);
-OGMDvdSubpStream*   ogmrip_subp_get_dvd_subp_stream     (OGMRipSubp *subp);
-gint                ogmrip_subp_get_charset             (OGMRipSubp *subp);
-void                ogmrip_subp_set_charset             (OGMRipSubp *subp,
-                                                         OGMRipCharset charset);
-gint                ogmrip_subp_get_eol_style           (OGMRipSubp *subp);
-void                ogmrip_subp_set_eol_style           (OGMRipSubp *subp,
-                                                         OGMRipEolStyle eol);
-gboolean            ogmrip_subp_get_forced_only         (OGMRipSubp *subp);
-void                ogmrip_subp_set_forced_only         (OGMRipSubp *subp,
-                                                         gboolean forced_only);
-
-
-
-
-

Object Hierarchy

-
-
-  GObject
-   +----OGMJobSpawn
-         +----OGMJobContainer
-               +----OGMJobBin
-                     +----OGMRipCodec
-                           +----OGMRipSubp
-
-
-
-

Properties

-
-
-  "charset"                  guint                 : Read / Write
-  "eol"                      guint                 : Read / Write
-  "forced-only"              gboolean              : Read / Write
-  "stream"                   gpointer              : Read / Write
-
-
-
-

Description

-

-

-

- -

-
-
-

Details

-
-

-OGMRipSubp

-
typedef struct _OGMRipSubp OGMRipSubp;
-

- -

-
-
-
-

-ogmrip_subp_set_dvd_subp_stream ()

-
void                ogmrip_subp_set_dvd_subp_stream     (OGMRipSubp *subp,
-                                                         OGMDvdSubpStream *stream);
-

-Sets the subtitle stream to encode.

-

- -

-
-- - - - - - - - - - -
subp : an OGMRipSubp -
stream : an OGMDvdSubpStream -
-
-
-
-

-ogmrip_subp_get_dvd_subp_stream ()

-
OGMDvdSubpStream*   ogmrip_subp_get_dvd_subp_stream     (OGMRipSubp *subp);
-

-Gets the subtitle stream to encode.

-

- -

-
-- - - - - - - - - - -
subp : an OGMRipSubp -
Returns : an OGMDvdSubpStream, or NULL -
-
-
-
-

-ogmrip_subp_get_charset ()

-
gint                ogmrip_subp_get_charset             (OGMRipSubp *subp);
-

-Gets the character set of text subtitles

-

- -

-
-- - - - - - - - - - -
subp : an OGMRipSubp -
Returns : an OGMRipCharset, or -1 -
-
-
-
-

-ogmrip_subp_set_charset ()

-
void                ogmrip_subp_set_charset             (OGMRipSubp *subp,
-                                                         OGMRipCharset charset);
-

-Sets the character set of text subtitles

-

- -

-
-- - - - - - - - - - -
subp : an OGMRipSubp -
charset : the OGMRipCharset -
-
-
-
-

-ogmrip_subp_get_eol_style ()

-
gint                ogmrip_subp_get_eol_style           (OGMRipSubp *subp);
-

-Gets the end-of-line characters of text subtitles

-

- -

-
-- - - - - - - - - - -
subp : an OGMRipSubp -
Returns : the OGMRipEolStyle, or -1 -
-
-
-
-

-ogmrip_subp_set_eol_style ()

-
void                ogmrip_subp_set_eol_style           (OGMRipSubp *subp,
-                                                         OGMRipEolStyle eol);
-

-Sets the end-of-line characters of text subtitles

-

- -

-
-- - - - - - - - - - -
subp : an OGMRipSubp -
eol : the OGMRipEolStyle -
-
-
-
-

-ogmrip_subp_get_forced_only ()

-
gboolean            ogmrip_subp_get_forced_only         (OGMRipSubp *subp);
-

-Gets whether to extract forced subtitles only.

-

- -

-
-- - - - - - - - - - -
subp : an OGMRipSubp -
Returns : TRUE to extract forced subtitles only -
-
-
-
-

-ogmrip_subp_set_forced_only ()

-
void                ogmrip_subp_set_forced_only         (OGMRipSubp *subp,
-                                                         gboolean forced_only);
-

-Sets whether to extract forced subtitles only.

-

- -

-
-- - - - - - - - - - -
subp : an OGMRipSubp -
forced_only : TRUE to extract forced subtitles only -
-
-
-
-

Property Details

-
-

-The "charset" property

-
  "charset"                  guint                 : Read / Write
-

Set charset.

-

Allowed values: <= 2

-

Default value: 0

-
-
-
-

-The "eol" property

-
  "eol"                      guint                 : Read / Write
-

Set end of line style.

-

Allowed values: <= 1

-

Default value: 0

-
-
-
-

-The "forced-only" property

-
  "forced-only"              gboolean              : Read / Write
-

Set forced only.

-

Default value: FALSE

-
-
-
-

-The "stream" property

-
  "stream"                   gpointer              : Read / Write
-

Set subp stream.

-
-
-
- - diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipVideoCodec.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipVideoCodec.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipVideoCodec.html 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipVideoCodec.html 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,2127 @@ + + + + +OGMRipVideoCodec + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

OGMRipVideoCodec

+

OGMRipVideoCodec — Base class for video codecs

+
+
+

Synopsis

+
+
+#include <ogmrip-video-codec.h>
+
+                    OGMRipVideoCodec;
+gboolean            ogmrip_video_codec_autocrop         (OGMRipVideoCodec *video,
+                                                         guint nframes);
+void                ogmrip_video_codec_autoscale        (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_autobitrate      (OGMRipVideoCodec *video,
+                                                         guint64 nonvideo_size,
+                                                         guint64 overhead_size,
+                                                         guint64 total_size);
+gboolean            ogmrip_video_codec_get_4mv          (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_4mv          (OGMRipVideoCodec *video,
+                                                         gboolean v4mv);
+gint                ogmrip_video_codec_get_angle        (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_angle        (OGMRipVideoCodec *video,
+                                                         guint angle);
+gint                ogmrip_video_codec_get_bitrate      (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_bitrate      (OGMRipVideoCodec *video,
+                                                         guint bitrate);
+gdouble             ogmrip_video_codec_get_bits_per_pixel
+                                                        (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_bits_per_pixel
+                                                        (OGMRipVideoCodec *video,
+                                                         gdouble bpp);
+gboolean            ogmrip_video_codec_get_cartoon      (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_cartoon      (OGMRipVideoCodec *video,
+                                                         gboolean cartoon);
+gboolean            ogmrip_video_codec_get_crop_size    (OGMRipVideoCodec *video,
+                                                         guint *x,
+                                                         guint *y,
+                                                         guint *width,
+                                                         guint *height);
+void                ogmrip_video_codec_set_crop_size    (OGMRipVideoCodec *video,
+                                                         guint x,
+                                                         guint y,
+                                                         guint width,
+                                                         guint height);
+gboolean            ogmrip_video_codec_get_deblock      (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_deblock      (OGMRipVideoCodec *video,
+                                                         gboolean deblock);
+gint                ogmrip_video_codec_get_deinterlacer (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_deinterlacer (OGMRipVideoCodec *video,
+                                                         OGMRipDeintType deint);
+gboolean            ogmrip_video_codec_get_denoise      (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_denoise      (OGMRipVideoCodec *video,
+                                                         gboolean denoise);
+gboolean            ogmrip_video_codec_get_dering       (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_dering       (OGMRipVideoCodec *video,
+                                                         gboolean dering);
+OGMDvdAudioStream*  ogmrip_video_codec_get_ensure_sync  (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_ensure_sync  (OGMRipVideoCodec *video,
+                                                         OGMDvdAudioStream *stream);
+gboolean            ogmrip_video_codec_get_grayscale    (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_grayscale    (OGMRipVideoCodec *video,
+                                                         gboolean grayscale);
+gint                ogmrip_video_codec_get_max_b_frames (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_max_b_frames (OGMRipVideoCodec *video,
+                                                         guint max_b_frames);
+gboolean            ogmrip_video_codec_get_max_size     (OGMRipVideoCodec *video,
+                                                         guint *width,
+                                                         guint *height,
+                                                         gboolean *expand);
+void                ogmrip_video_codec_set_max_size     (OGMRipVideoCodec *video,
+                                                         guint width,
+                                                         guint height,
+                                                         gboolean expand);
+gint                ogmrip_video_codec_get_passes       (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_passes       (OGMRipVideoCodec *video,
+                                                         guint pass);
+gboolean            ogmrip_video_codec_get_qpel         (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_qpel         (OGMRipVideoCodec *video,
+                                                         gboolean qpel);
+gint                ogmrip_video_codec_get_quality      (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_quality      (OGMRipVideoCodec *video,
+                                                         OGMRipQualityType quality);
+gdouble             ogmrip_video_codec_get_quantizer    (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_quantizer    (OGMRipVideoCodec *video,
+                                                         gdouble quantizer);
+void                ogmrip_video_codec_get_raw_size     (OGMRipVideoCodec *video,
+                                                         guint *width,
+                                                         guint *height);
+gboolean            ogmrip_video_codec_get_scale_size   (OGMRipVideoCodec *video,
+                                                         guint *width,
+                                                         guint *height);
+void                ogmrip_video_codec_set_scale_size   (OGMRipVideoCodec *video,
+                                                         guint width,
+                                                         guint height);
+gint                ogmrip_video_codec_get_scaler       (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_scaler       (OGMRipVideoCodec *video,
+                                                         OGMRipScalerType scaler);
+gint                ogmrip_video_codec_get_threads      (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_threads      (OGMRipVideoCodec *video,
+                                                         guint threads);
+gboolean            ogmrip_video_codec_get_trellis      (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_trellis      (OGMRipVideoCodec *video,
+                                                         gboolean trellis);
+gboolean            ogmrip_video_codec_get_turbo        (OGMRipVideoCodec *video);
+void                ogmrip_video_codec_set_turbo        (OGMRipVideoCodec *video,
+                                                         gboolean turbo);
+gint                ogmrip_video_codec_get_start_delay  (OGMRipVideoCodec *video);
+
+
+
+

Object Hierarchy

+
+  GObject
+   +----OGMJobSpawn
+         +----OGMJobContainer
+               +----OGMJobBin
+                     +----OGMRipCodec
+                           +----OGMRipVideoCodec
+
+
+
+

Properties

+
+  "angle"                    guint                 : Read / Write
+  "bframes"                  guint                 : Read / Write
+  "bitrate"                  guint                 : Read / Write
+  "bpp"                      gdouble               : Read / Write
+  "cartoon"                  gboolean              : Read / Write
+  "deblock"                  gboolean              : Read / Write
+  "denoise"                  gboolean              : Read / Write
+  "dering"                   gboolean              : Read / Write
+  "grayscale"                gboolean              : Read / Write
+  "passes"                   guint                 : Read / Write
+  "qpel"                     gboolean              : Read / Write
+  "quantizer"                gdouble               : Read / Write
+  "threads"                  guint                 : Read / Write
+  "trellis"                  gboolean              : Read / Write
+  "turbo"                    gboolean              : Read / Write
+  "v4mv"                     gboolean              : Read / Write
+
+
+
+

Description

+

+

+

+ +

+
+
+

Details

+
+

OGMRipVideoCodec

+
typedef struct _OGMRipVideoCodec OGMRipVideoCodec;
+

+ +

+
+
+
+

ogmrip_video_codec_autocrop ()

+
gboolean            ogmrip_video_codec_autocrop         (OGMRipVideoCodec *video,
+                                                         guint nframes);
+

+Autodetects the cropping parameters.

+

+ +

+
++ + + + + + + + + + + + + + +

video :

 an OGMRipVideoCodec +

nframes :

 the number of frames +

Returns :

 FALSE, on error or cancel +
+
+
+
+

ogmrip_video_codec_autoscale ()

+
void                ogmrip_video_codec_autoscale        (OGMRipVideoCodec *video);
+

+Autodetects the scaling parameters.

+

+ +

+
++ + + + +

video :

 an OGMRipVideoCodec +
+
+
+
+

ogmrip_video_codec_autobitrate ()

+
void                ogmrip_video_codec_autobitrate      (OGMRipVideoCodec *video,
+                                                         guint64 nonvideo_size,
+                                                         guint64 overhead_size,
+                                                         guint64 total_size);
+

+Autodetects the video bitrate.

+

+ +

+
++ + + + + + + + + + + + + + + + + + +

video :

 an OGMRipVideoCodec +

nonvideo_size :

 the size of the non video streams +

overhead_size :

 the size of the overhead +

total_size :

 the total targetted size +
+
+
+
+

ogmrip_video_codec_get_4mv ()

+
gboolean            ogmrip_video_codec_get_4mv          (OGMRipVideoCodec *video);
+

+Gets whether 4 motion vectors per macroblock are allowed.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 TRUE if 4 motion vectors per macroblock are allowed +
+
+
+
+

ogmrip_video_codec_set_4mv ()

+
void                ogmrip_video_codec_set_4mv          (OGMRipVideoCodec *video,
+                                                         gboolean v4mv);
+

+Sets whether to allow 4 motion vectors per macroblock.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

v4mv :

 TRUE to allow 4 motion vectors per macroblock +
+
+
+
+

ogmrip_video_codec_get_angle ()

+
gint                ogmrip_video_codec_get_angle        (OGMRipVideoCodec *video);
+

+Gets the current angle.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 the angle, or -1 +
+
+
+
+

ogmrip_video_codec_set_angle ()

+
void                ogmrip_video_codec_set_angle        (OGMRipVideoCodec *video,
+                                                         guint angle);
+

+Sets the angle to encode.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

angle :

 the angle +
+
+
+
+

ogmrip_video_codec_get_bitrate ()

+
gint                ogmrip_video_codec_get_bitrate      (OGMRipVideoCodec *video);
+

+Gets the video bitrate in bits/second.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 the video bitrate, or -1 +
+
+
+
+

ogmrip_video_codec_set_bitrate ()

+
void                ogmrip_video_codec_set_bitrate      (OGMRipVideoCodec *video,
+                                                         guint bitrate);
+

+Sets the video bitrate to be used in bits/second, 4000 being the lowest and +24000000 the highest available bitrates.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

bitrate :

 the video bitrate +
+
+
+
+

ogmrip_video_codec_get_bits_per_pixel ()

+
gdouble             ogmrip_video_codec_get_bits_per_pixel
+                                                        (OGMRipVideoCodec *video);
+

+Gets the number of bits per pixel.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 the number of bits per pixel, or -1 +
+
+
+
+

ogmrip_video_codec_set_bits_per_pixel ()

+
void                ogmrip_video_codec_set_bits_per_pixel
+                                                        (OGMRipVideoCodec *video,
+                                                         gdouble bpp);
+

+Sets the number of bits per pixel to be used.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

bpp :

 the number of bits per pixel +
+
+
+
+

ogmrip_video_codec_get_cartoon ()

+
gboolean            ogmrip_video_codec_get_cartoon      (OGMRipVideoCodec *video);
+

+Gets whether the movie is a cartoon.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 TRUE if movie is a cartoon +
+
+
+
+

ogmrip_video_codec_set_cartoon ()

+
void                ogmrip_video_codec_set_cartoon      (OGMRipVideoCodec *video,
+                                                         gboolean cartoon);
+

+Sets whether the movie is a cartoon.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

cartoon :

 TRUE if movie is a cartoon +
+
+
+
+

ogmrip_video_codec_get_crop_size ()

+
gboolean            ogmrip_video_codec_get_crop_size    (OGMRipVideoCodec *video,
+                                                         guint *x,
+                                                         guint *y,
+                                                         guint *width,
+                                                         guint *height);
+

+Gets whether the video will be cropped and the crop size.

+

+ +

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + +

video :

 an OGMRipVideoCodec +

x :

 a pointer to store the cropped x position +

y :

 a pointer to store the cropped y position +

width :

 a pointer to store the cropped width +

height :

 a pointer to store the cropped height +

Returns :

 TRUE if the video will be cropped +
+
+
+
+

ogmrip_video_codec_set_crop_size ()

+
void                ogmrip_video_codec_set_crop_size    (OGMRipVideoCodec *video,
+                                                         guint x,
+                                                         guint y,
+                                                         guint width,
+                                                         guint height);
+

+Sets the crop size of the movie.

+

+ +

+
++ + + + + + + + + + + + + + + + + + + + + + +

video :

 an OGMRipVideoCodec +

x :

 the cropped x position +

y :

 the cropped y position +

width :

 the cropped width +

height :

 the cropped height +
+
+
+
+

ogmrip_video_codec_get_deblock ()

+
gboolean            ogmrip_video_codec_get_deblock      (OGMRipVideoCodec *video);
+

+Gets whether a deblocking filter will be applied.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 TRUE if a deblocking filter will be applied +
+
+
+
+

ogmrip_video_codec_set_deblock ()

+
void                ogmrip_video_codec_set_deblock      (OGMRipVideoCodec *video,
+                                                         gboolean deblock);
+

+Sets whether to apply a deblocking filter.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

deblock :

 TRUE to apply a deblocking filter +
+
+
+
+

ogmrip_video_codec_get_deinterlacer ()

+
gint                ogmrip_video_codec_get_deinterlacer (OGMRipVideoCodec *video);
+

+Gets the currnet deinterlacer.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 the deinterlacer, or -1 +
+
+
+
+

ogmrip_video_codec_set_deinterlacer ()

+
void                ogmrip_video_codec_set_deinterlacer (OGMRipVideoCodec *video,
+                                                         OGMRipDeintType deint);
+

+Sets the deinterlacer to be used.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

deint :

 an OGMRipDeintType +
+
+
+
+

ogmrip_video_codec_get_denoise ()

+
gboolean            ogmrip_video_codec_get_denoise      (OGMRipVideoCodec *video);
+

+Gets whether to reduce image noise.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 TRUE to reduce image noise +
+
+
+
+

ogmrip_video_codec_set_denoise ()

+
void                ogmrip_video_codec_set_denoise      (OGMRipVideoCodec *video,
+                                                         gboolean denoise);
+

+Sets whether to reduce image noise.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

denoise :

 TRUE to reduce image noise +
+
+
+
+

ogmrip_video_codec_get_dering ()

+
gboolean            ogmrip_video_codec_get_dering       (OGMRipVideoCodec *video);
+

+Gets whether a deringing filter will be applied.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 TRUE if a deringing filter will be applied +
+
+
+
+

ogmrip_video_codec_set_dering ()

+
void                ogmrip_video_codec_set_dering       (OGMRipVideoCodec *video,
+                                                         gboolean dering);
+

+Sets whether to apply a deringing filter.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

dering :

 TRUE to apply a deringing filter +
+
+
+
+

ogmrip_video_codec_get_ensure_sync ()

+
OGMDvdAudioStream*  ogmrip_video_codec_get_ensure_sync  (OGMRipVideoCodec *video);
+

+Gets the audio stream that will be encoded along with the video to ensure +the A/V synchronization.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 the OGMDvdAudioStream, or NULL +
+
+
+
+

ogmrip_video_codec_set_ensure_sync ()

+
void                ogmrip_video_codec_set_ensure_sync  (OGMRipVideoCodec *video,
+                                                         OGMDvdAudioStream *stream);
+

+Sets the audio stream that will be encoded along with the video to ensure +the A/V synchronization.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

stream :

 an OGMDvdAudioStream +
+
+
+
+

ogmrip_video_codec_get_grayscale ()

+
gboolean            ogmrip_video_codec_get_grayscale    (OGMRipVideoCodec *video);
+

+Gets whether the movie is grayscale.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 TRUE if movie is grayscale +
+
+
+
+

ogmrip_video_codec_set_grayscale ()

+
void                ogmrip_video_codec_set_grayscale    (OGMRipVideoCodec *video,
+                                                         gboolean grayscale);
+

+Sets whether the movie is grayscale.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

grayscale :

 TRUE if movie is grayscale +
+
+
+
+

ogmrip_video_codec_get_max_b_frames ()

+
gint                ogmrip_video_codec_get_max_b_frames (OGMRipVideoCodec *video);
+

+Gets the maximum number of B-frames to put between I/P-frames.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 the maximum number of B-frames, or -1 +
+
+
+
+

ogmrip_video_codec_set_max_b_frames ()

+
void                ogmrip_video_codec_set_max_b_frames (OGMRipVideoCodec *video,
+                                                         guint max_b_frames);
+

+Sets the maximum number of B-frames to put between I/P-frames.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

max_b_frames :

 the maximum number of B-frames +
+
+
+
+

ogmrip_video_codec_get_max_size ()

+
gboolean            ogmrip_video_codec_get_max_size     (OGMRipVideoCodec *video,
+                                                         guint *width,
+                                                         guint *height,
+                                                         gboolean *expand);
+

+Gets wether the video has a maximum size and the maximum size.

+

+ +

+
++ + + + + + + + + + + + + + + + + + + + + + +

video :

 an OGMRipVideoCodec +

width :

 a pointer to store the maximum width +

height :

 a pointer to store the maximum height +

expand :

 whether the video must be expanded +

Returns :

 TRUE if the video has a maximum size +
+
+
+
+

ogmrip_video_codec_set_max_size ()

+
void                ogmrip_video_codec_set_max_size     (OGMRipVideoCodec *video,
+                                                         guint width,
+                                                         guint height,
+                                                         gboolean expand);
+

+Sets the maximum size of the movie.

+

+ +

+
++ + + + + + + + + + + + + + + + + + +

video :

 an OGMRipVideoCodec +

width :

 the maximum width +

height :

 the maximum height +

expand :

 wheter to expand the video +
+
+
+
+

ogmrip_video_codec_get_passes ()

+
gint                ogmrip_video_codec_get_passes       (OGMRipVideoCodec *video);
+

+Gets the number of passes.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 the pass number, or -1 +
+
+
+
+

ogmrip_video_codec_set_passes ()

+
void                ogmrip_video_codec_set_passes       (OGMRipVideoCodec *video,
+                                                         guint pass);
+

+Sets the number of passes.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

pass :

 the pass number +
+
+
+
+

ogmrip_video_codec_get_qpel ()

+
gboolean            ogmrip_video_codec_get_qpel         (OGMRipVideoCodec *video);
+

+Sets whether quarter pel motion compensation is used.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 TRUE if quarter pel motion compensation is used +
+
+
+
+

ogmrip_video_codec_set_qpel ()

+
void                ogmrip_video_codec_set_qpel         (OGMRipVideoCodec *video,
+                                                         gboolean qpel);
+

+Sets whether to use quarter pel motion compensation.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

qpel :

 TRUE to use quarter pel motion compensation +
+
+
+
+

ogmrip_video_codec_get_quality ()

+
gint                ogmrip_video_codec_get_quality      (OGMRipVideoCodec *video);
+

+Gets the quality of the encoding.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 the OGMRipQualityType, or -1 +
+
+
+
+

ogmrip_video_codec_set_quality ()

+
void                ogmrip_video_codec_set_quality      (OGMRipVideoCodec *video,
+                                                         OGMRipQualityType quality);
+

+Sets the quality of the encoding.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

quality :

 the OGMRipQualityType +
+
+
+
+

ogmrip_video_codec_get_quantizer ()

+
gdouble             ogmrip_video_codec_get_quantizer    (OGMRipVideoCodec *video);
+

+Gets the video quantizer.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 the video quantizer, or -1 +
+
+
+
+

ogmrip_video_codec_set_quantizer ()

+
void                ogmrip_video_codec_set_quantizer    (OGMRipVideoCodec *video,
+                                                         gdouble quantizer);
+

+Sets the video quantizer to be used, 1 being the lowest and 31 the highest +available quantizers.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

quantizer :

 the video quantizer +
+
+
+
+

ogmrip_video_codec_get_raw_size ()

+
void                ogmrip_video_codec_get_raw_size     (OGMRipVideoCodec *video,
+                                                         guint *width,
+                                                         guint *height);
+

+Gets the raw size of the video.

+

+ +

+
++ + + + + + + + + + + + + + +

video :

 an OGMRipVideoCodec +

width :

 a pointer to store the width +

height :

 a pointer to store the height +
+
+
+
+

ogmrip_video_codec_get_scale_size ()

+
gboolean            ogmrip_video_codec_get_scale_size   (OGMRipVideoCodec *video,
+                                                         guint *width,
+                                                         guint *height);
+

+Gets whether the video will be scaled and the scale size.

+

+ +

+
++ + + + + + + + + + + + + + + + + + +

video :

 an OGMRipVideoCodec +

width :

 a pointer to store the scaled width +

height :

 a pointer to store the scaled height +

Returns :

 TRUE if the video will be scaled +
+
+
+
+

ogmrip_video_codec_set_scale_size ()

+
void                ogmrip_video_codec_set_scale_size   (OGMRipVideoCodec *video,
+                                                         guint width,
+                                                         guint height);
+

+Sets the scaled size of the movie.

+

+ +

+
++ + + + + + + + + + + + + + +

video :

 an OGMRipVideoCodec +

width :

 the scaled width +

height :

 the scaled height +
+
+
+
+

ogmrip_video_codec_get_scaler ()

+
gint                ogmrip_video_codec_get_scaler       (OGMRipVideoCodec *video);
+

+Gets the current software scaler.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 the software scaler, or -1 +
+
+
+
+

ogmrip_video_codec_set_scaler ()

+
void                ogmrip_video_codec_set_scaler       (OGMRipVideoCodec *video,
+                                                         OGMRipScalerType scaler);
+

+Sets the software scaler to be used.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

scaler :

 an OGMRipScalerType +
+
+
+
+

ogmrip_video_codec_get_threads ()

+
gint                ogmrip_video_codec_get_threads      (OGMRipVideoCodec *video);
+

+Gets the number of threads.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 the number of threads, or -1 +
+
+
+
+

ogmrip_video_codec_set_threads ()

+
void                ogmrip_video_codec_set_threads      (OGMRipVideoCodec *video,
+                                                         guint threads);
+

+Sets the number of threads to be used.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

threads :

 the number of threads +
+
+
+
+

ogmrip_video_codec_get_trellis ()

+
gboolean            ogmrip_video_codec_get_trellis      (OGMRipVideoCodec *video);
+

+Gets whether trellis quantization is enabled.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 TRUE if trellis quantization is enabled +
+
+
+
+

ogmrip_video_codec_set_trellis ()

+
void                ogmrip_video_codec_set_trellis      (OGMRipVideoCodec *video,
+                                                         gboolean trellis);
+

+Sets whether trellis quantization will be enabled.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

trellis :

 TRUE to enable trellis quantization +
+
+
+
+

ogmrip_video_codec_get_turbo ()

+
gboolean            ogmrip_video_codec_get_turbo        (OGMRipVideoCodec *video);
+

+Gets whether turbo is enabled.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 TRUE if turbo is enabled +
+
+
+
+

ogmrip_video_codec_set_turbo ()

+
void                ogmrip_video_codec_set_turbo        (OGMRipVideoCodec *video,
+                                                         gboolean turbo);
+

+Sets whether to enable turbo.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

turbo :

 TRUE to enable turbo +
+
+
+
+

ogmrip_video_codec_get_start_delay ()

+
gint                ogmrip_video_codec_get_start_delay  (OGMRipVideoCodec *video);
+

+Gets the start delay that must be applied to audio streams when merging.

+

+ +

+
++ + + + + + + + + + +

video :

 an OGMRipVideoCodec +

Returns :

 the start delay, or -1 +
+
+
+
+

Property Details

+
+

The "angle" property

+
  "angle"                    guint                 : Read / Write
+

Set angle.

+

Allowed values: >= 1

+

Default value: 1

+
+
+
+

The "bframes" property

+
  "bframes"                  guint                 : Read / Write
+

Set b-frames.

+

Allowed values: <= 4

+

Default value: 2

+
+
+
+

The "bitrate" property

+
  "bitrate"                  guint                 : Read / Write
+

Set bitrate.

+

Allowed values: [4000,24000000]

+

Default value: 800000

+
+
+
+

The "bpp" property

+
  "bpp"                      gdouble               : Read / Write
+

Set bits per pixel.

+

Allowed values: [0,1]

+

Default value: 0.25

+
+
+
+

The "cartoon" property

+
  "cartoon"                  gboolean              : Read / Write
+

Set cartoon.

+

Default value: FALSE

+
+
+
+

The "deblock" property

+
  "deblock"                  gboolean              : Read / Write
+

Set deblock.

+

Default value: TRUE

+
+
+
+

The "denoise" property

+
  "denoise"                  gboolean              : Read / Write
+

Set denoise.

+

Default value: FALSE

+
+
+
+

The "dering" property

+
  "dering"                   gboolean              : Read / Write
+

Set dering.

+

Default value: TRUE

+
+
+
+

The "grayscale" property

+
  "grayscale"                gboolean              : Read / Write
+

Set grayscale.

+

Default value: FALSE

+
+
+
+

The "passes" property

+
  "passes"                   guint                 : Read / Write
+

Set the number of passes.

+

Allowed values: >= 1

+

Default value: 1

+
+
+
+

The "qpel" property

+
  "qpel"                     gboolean              : Read / Write
+

Set quarter pel motion compensation.

+

Default value: FALSE

+
+
+
+

The "quantizer" property

+
  "quantizer"                gdouble               : Read / Write
+

Set quantizer.

+

Allowed values: [-1,31]

+

Default value: -1

+
+
+
+

The "threads" property

+
  "threads"                  guint                 : Read / Write
+

Set the number of threads.

+

Default value: 0

+
+
+
+

The "trellis" property

+
  "trellis"                  gboolean              : Read / Write
+

Set trellis.

+

Default value: TRUE

+
+
+
+

The "turbo" property

+
  "turbo"                    gboolean              : Read / Write
+

Set turbo.

+

Default value: FALSE

+
+
+
+

The "v4mv" property

+
  "v4mv"                     gboolean              : Read / Write
+

Set 4 motion vectors per macroblock.

+

Default value: TRUE

+
+
+
+
+
+ Generated by GTK-Doc V1.10
+ + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipVideo.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipVideo.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/OGMRipVideo.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/OGMRipVideo.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,1950 +0,0 @@ - - - - -OGMRipVideo - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

-OGMRipVideo -

-

OGMRipVideo — Base class for video codecs

-
-
-

Synopsis

-
-
-#include <ogmrip-video.h>
-
-
-                    OGMRipVideo;
-gboolean            ogmrip_video_autocrop               (OGMRipVideo *video,
-                                                         guint nframes);
-void                ogmrip_video_autoscale              (OGMRipVideo *video);
-void                ogmrip_video_autobitrate            (OGMRipVideo *video,
-                                                         guint64 nonvideo_size,
-                                                         guint64 overhead_size,
-                                                         guint64 total_size);
-gboolean            ogmrip_video_get_4mv                (OGMRipVideo *video);
-void                ogmrip_video_set_4mv                (OGMRipVideo *video,
-                                                         gboolean v4mv);
-gint                ogmrip_video_get_angle              (OGMRipVideo *video);
-void                ogmrip_video_set_angle              (OGMRipVideo *video,
-                                                         guint angle);
-gint                ogmrip_video_get_bitrate            (OGMRipVideo *video);
-void                ogmrip_video_set_bitrate            (OGMRipVideo *video,
-                                                         guint bitrate);
-gdouble             ogmrip_video_get_bits_per_pixel     (OGMRipVideo *video);
-void                ogmrip_video_set_bits_per_pixel     (OGMRipVideo *video,
-                                                         gdouble bpp);
-gboolean            ogmrip_video_get_cartoon            (OGMRipVideo *video);
-void                ogmrip_video_set_cartoon            (OGMRipVideo *video,
-                                                         gboolean cartoon);
-gboolean            ogmrip_video_get_crop_size          (OGMRipVideo *video,
-                                                         guint *x,
-                                                         guint *y,
-                                                         guint *width,
-                                                         guint *height);
-void                ogmrip_video_set_crop_size          (OGMRipVideo *video,
-                                                         guint x,
-                                                         guint y,
-                                                         guint width,
-                                                         guint height);
-gboolean            ogmrip_video_get_deblock            (OGMRipVideo *video);
-void                ogmrip_video_set_deblock            (OGMRipVideo *video,
-                                                         gboolean deblock);
-gint                ogmrip_video_get_deinterlacer       (OGMRipVideo *video);
-void                ogmrip_video_set_deinterlacer       (OGMRipVideo *video,
-                                                         OGMRipDeintType deint);
-gboolean            ogmrip_video_get_denoise            (OGMRipVideo *video);
-void                ogmrip_video_set_denoise            (OGMRipVideo *video,
-                                                         gboolean denoise);
-gboolean            ogmrip_video_get_dering             (OGMRipVideo *video);
-void                ogmrip_video_set_dering             (OGMRipVideo *video,
-                                                         gboolean dering);
-OGMDvdAudioStream*  ogmrip_video_get_ensure_sync        (OGMRipVideo *video);
-void                ogmrip_video_set_ensure_sync        (OGMRipVideo *video,
-                                                         OGMDvdAudioStream *stream);
-gboolean            ogmrip_video_get_grayscale          (OGMRipVideo *video);
-void                ogmrip_video_set_grayscale          (OGMRipVideo *video,
-                                                         gboolean grayscale);
-gchar*              ogmrip_video_get_log                (OGMRipVideo *video);
-void                ogmrip_video_set_log                (OGMRipVideo *video,
-                                                         const gchar *log);
-gint                ogmrip_video_get_max_b_frames       (OGMRipVideo *video);
-void                ogmrip_video_set_max_b_frames       (OGMRipVideo *video,
-                                                         guint max_b_frames);
-gint                ogmrip_video_get_pass               (OGMRipVideo *video);
-void                ogmrip_video_set_pass               (OGMRipVideo *video,
-                                                         guint pass);
-gboolean            ogmrip_video_get_pullup             (OGMRipVideo *video);
-void                ogmrip_video_set_pullup             (OGMRipVideo *video,
-                                                         gboolean pullup);
-gboolean            ogmrip_video_get_qpel               (OGMRipVideo *video);
-void                ogmrip_video_set_qpel               (OGMRipVideo *video,
-                                                         gboolean qpel);
-gint                ogmrip_video_get_quality            (OGMRipVideo *video);
-void                ogmrip_video_set_quality            (OGMRipVideo *video,
-                                                         OGMRipQualityType quality);
-gdouble             ogmrip_video_get_quantizer          (OGMRipVideo *video);
-void                ogmrip_video_set_quantizer          (OGMRipVideo *video,
-                                                         gdouble quantizer);
-void                ogmrip_video_get_raw_size           (OGMRipVideo *video,
-                                                         guint *width,
-                                                         guint *height);
-gboolean            ogmrip_video_get_scale_size         (OGMRipVideo *video,
-                                                         guint *width,
-                                                         guint *height);
-void                ogmrip_video_set_scale_size         (OGMRipVideo *video,
-                                                         guint width,
-                                                         guint height);
-gint                ogmrip_video_get_scaler             (OGMRipVideo *video);
-void                ogmrip_video_set_scaler             (OGMRipVideo *video,
-                                                         OGMRipScalerType scaler);
-gint                ogmrip_video_get_threads            (OGMRipVideo *video);
-void                ogmrip_video_set_threads            (OGMRipVideo *video,
-                                                         guint threads);
-gboolean            ogmrip_video_get_trellis            (OGMRipVideo *video);
-void                ogmrip_video_set_trellis            (OGMRipVideo *video,
-                                                         gboolean trellis);
-gboolean            ogmrip_video_get_turbo              (OGMRipVideo *video);
-void                ogmrip_video_set_turbo              (OGMRipVideo *video,
-                                                         gboolean turbo);
-
-
-
-
-

Object Hierarchy

-
-
-  GObject
-   +----OGMJobSpawn
-         +----OGMJobContainer
-               +----OGMJobBin
-                     +----OGMRipCodec
-                           +----OGMRipVideo
-
-
-
-

Description

-

-

-

- -

-
-
-

Details

-
-

-OGMRipVideo

-
typedef struct _OGMRipVideo OGMRipVideo;
-

- -

-
-
-
-

-ogmrip_video_autocrop ()

-
gboolean            ogmrip_video_autocrop               (OGMRipVideo *video,
-                                                         guint nframes);
-

-Autodetects the cropping parameters.

-

- -

-
-- - - - - - - - - - - - - - -
video : an OGMRipVideo -
nframes : the number of frames -
Returns : FALSE, on error or cancel -
-
-
-
-

-ogmrip_video_autoscale ()

-
void                ogmrip_video_autoscale              (OGMRipVideo *video);
-

-Autodetects the scaling parameters.

-

- -

-
-- - - - -
video : an OGMRipVideo -
-
-
-
-

-ogmrip_video_autobitrate ()

-
void                ogmrip_video_autobitrate            (OGMRipVideo *video,
-                                                         guint64 nonvideo_size,
-                                                         guint64 overhead_size,
-                                                         guint64 total_size);
-

-Autodetects the video bitrate.

-

- -

-
-- - - - - - - - - - - - - - - - - - -
video : an OGMRipVideo -
nonvideo_size : the size of the non video streams -
overhead_size : the size of the overhead -
total_size : the total targetted size -
-
-
-
-

-ogmrip_video_get_4mv ()

-
gboolean            ogmrip_video_get_4mv                (OGMRipVideo *video);
-

-Gets whether 4 motion vectors per macroblock are allowed.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : TRUE if 4 motion vectors per macroblock are allowed -
-
-
-
-

-ogmrip_video_set_4mv ()

-
void                ogmrip_video_set_4mv                (OGMRipVideo *video,
-                                                         gboolean v4mv);
-

-Sets whether to allow 4 motion vectors per macroblock.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
v4mv : TRUE to allow 4 motion vectors per macroblock -
-
-
-
-

-ogmrip_video_get_angle ()

-
gint                ogmrip_video_get_angle              (OGMRipVideo *video);
-

-Gets the current angle.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : the angle, or -1 -
-
-
-
-

-ogmrip_video_set_angle ()

-
void                ogmrip_video_set_angle              (OGMRipVideo *video,
-                                                         guint angle);
-

-Sets the angle to encode.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
angle : the angle -
-
-
-
-

-ogmrip_video_get_bitrate ()

-
gint                ogmrip_video_get_bitrate            (OGMRipVideo *video);
-

-Gets the video bitrate in bits/second.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : the video bitrate, or -1 -
-
-
-
-

-ogmrip_video_set_bitrate ()

-
void                ogmrip_video_set_bitrate            (OGMRipVideo *video,
-                                                         guint bitrate);
-

-Sets the video bitrate to be used in bits/second, 4000 being the lowest and -24000000 the highest available bitrates.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
bitrate : the video bitrate -
-
-
-
-

-ogmrip_video_get_bits_per_pixel ()

-
gdouble             ogmrip_video_get_bits_per_pixel     (OGMRipVideo *video);
-

-Gets the number of bits per pixel.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : the number of bits per pixel, or -1 -
-
-
-
-

-ogmrip_video_set_bits_per_pixel ()

-
void                ogmrip_video_set_bits_per_pixel     (OGMRipVideo *video,
-                                                         gdouble bpp);
-

-Sets the number of bits per pixel to be used.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
bpp : the number of bits per pixel -
-
-
-
-

-ogmrip_video_get_cartoon ()

-
gboolean            ogmrip_video_get_cartoon            (OGMRipVideo *video);
-

-Gets whether the movie is a cartoon.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : TRUE if movie is a cartoon -
-
-
-
-

-ogmrip_video_set_cartoon ()

-
void                ogmrip_video_set_cartoon            (OGMRipVideo *video,
-                                                         gboolean cartoon);
-

-Sets whether the movie is a cartoon.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
cartoon : TRUE if movie is a cartoon -
-
-
-
-

-ogmrip_video_get_crop_size ()

-
gboolean            ogmrip_video_get_crop_size          (OGMRipVideo *video,
-                                                         guint *x,
-                                                         guint *y,
-                                                         guint *width,
-                                                         guint *height);
-

-Gets whether the video will be cropped and the crop size.

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - - - - - -
video : an OGMRipVideo -
x : a pointer to store the cropped x position -
y : a pointer to store the cropped y position -
width : a pointer to store the cropped width -
height : a pointer to store the cropped height -
Returns : TRUE if the video will be cropped -
-
-
-
-

-ogmrip_video_set_crop_size ()

-
void                ogmrip_video_set_crop_size          (OGMRipVideo *video,
-                                                         guint x,
-                                                         guint y,
-                                                         guint width,
-                                                         guint height);
-

-Sets the crop size of the movie.

-

- -

-
-- - - - - - - - - - - - - - - - - - - - - - -
video : an OGMRipVideo -
x : the cropped x position -
y : the cropped y position -
width : the cropped width -
height : the cropped height -
-
-
-
-

-ogmrip_video_get_deblock ()

-
gboolean            ogmrip_video_get_deblock            (OGMRipVideo *video);
-

-Gets whether a deblocking filter will be applied.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : TRUE if a deblocking filter will be applied -
-
-
-
-

-ogmrip_video_set_deblock ()

-
void                ogmrip_video_set_deblock            (OGMRipVideo *video,
-                                                         gboolean deblock);
-

-Sets whether to apply a deblocking filter.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
deblock : TRUE to apply a deblocking filter -
-
-
-
-

-ogmrip_video_get_deinterlacer ()

-
gint                ogmrip_video_get_deinterlacer       (OGMRipVideo *video);
-

-Gets the currnet deinterlacer.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : the deinterlacer, or -1 -
-
-
-
-

-ogmrip_video_set_deinterlacer ()

-
void                ogmrip_video_set_deinterlacer       (OGMRipVideo *video,
-                                                         OGMRipDeintType deint);
-

-Sets the deinterlacer to be used.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
deint : an OGMRipDeintType -
-
-
-
-

-ogmrip_video_get_denoise ()

-
gboolean            ogmrip_video_get_denoise            (OGMRipVideo *video);
-

-Gets whether to reduce image noise.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : TRUE to reduce image noise -
-
-
-
-

-ogmrip_video_set_denoise ()

-
void                ogmrip_video_set_denoise            (OGMRipVideo *video,
-                                                         gboolean denoise);
-

-Sets whether to reduce image noise.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
denoise : TRUE to reduce image noise -
-
-
-
-

-ogmrip_video_get_dering ()

-
gboolean            ogmrip_video_get_dering             (OGMRipVideo *video);
-

-Gets whether a deringing filter will be applied.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : TRUE if a deringing filter will be applied -
-
-
-
-

-ogmrip_video_set_dering ()

-
void                ogmrip_video_set_dering             (OGMRipVideo *video,
-                                                         gboolean dering);
-

-Sets whether to apply a deringing filter.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
dering : TRUE to apply a deringing filter -
-
-
-
-

-ogmrip_video_get_ensure_sync ()

-
OGMDvdAudioStream*  ogmrip_video_get_ensure_sync        (OGMRipVideo *video);
-

-Gets the audio stream that will be encoded along with the video to ensure -the A/V synchronization.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : the OGMDvdAudioStream, or NULL -
-
-
-
-

-ogmrip_video_set_ensure_sync ()

-
void                ogmrip_video_set_ensure_sync        (OGMRipVideo *video,
-                                                         OGMDvdAudioStream *stream);
-

-Sets the audio stream that will be encoded along with the video to ensure -the A/V synchronization.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
stream : an OGMDvdAudioStream -
-
-
-
-

-ogmrip_video_get_grayscale ()

-
gboolean            ogmrip_video_get_grayscale          (OGMRipVideo *video);
-

-Gets whether the movie is grayscale.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : TRUE if movie is grayscale -
-
-
-
-

-ogmrip_video_set_grayscale ()

-
void                ogmrip_video_set_grayscale          (OGMRipVideo *video,
-                                                         gboolean grayscale);
-

-Sets whether the movie is grayscale.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
grayscale : TRUE if movie is grayscale -
-
-
-
-

-ogmrip_video_get_log ()

-
gchar*              ogmrip_video_get_log                (OGMRipVideo *video);
-

-Gets the name of the file in which to dump first path information.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : the filename, or NULL -
-
-
-
-

-ogmrip_video_set_log ()

-
void                ogmrip_video_set_log                (OGMRipVideo *video,
-                                                         const gchar *log);
-

-Sets the name of the file in which to dump first path information.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
log : the name of the log file -
-
-
-
-

-ogmrip_video_get_max_b_frames ()

-
gint                ogmrip_video_get_max_b_frames       (OGMRipVideo *video);
-

-Gets the maximum number of B-frames to put between I/P-frames.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : the maximum number of B-frames, or -1 -
-
-
-
-

-ogmrip_video_set_max_b_frames ()

-
void                ogmrip_video_set_max_b_frames       (OGMRipVideo *video,
-                                                         guint max_b_frames);
-

-Sets the maximum number of B-frames to put between I/P-frames.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
max_b_frames : the maximum number of B-frames -
-
-
-
-

-ogmrip_video_get_pass ()

-
gint                ogmrip_video_get_pass               (OGMRipVideo *video);
-

-Gets the current pass number.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : the pass number, or -1 -
-
-
-
-

-ogmrip_video_set_pass ()

-
void                ogmrip_video_set_pass               (OGMRipVideo *video,
-                                                         guint pass);
-

-Sets the pass number of the encoding.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
pass : the pass number -
-
-
-
-

-ogmrip_video_get_pullup ()

-
gboolean            ogmrip_video_get_pullup             (OGMRipVideo *video);
-

-Gets whether an inverse telecine filter will be applied

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : TRUE if inverse telecine -
-
-
-
-

-ogmrip_video_set_pullup ()

-
void                ogmrip_video_set_pullup             (OGMRipVideo *video,
-                                                         gboolean pullup);
-

-Sets whether an inverse telecine filter will be applied

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
pullup : TRUE to inverse telecine -
-
-
-
-

-ogmrip_video_get_qpel ()

-
gboolean            ogmrip_video_get_qpel               (OGMRipVideo *video);
-

-Sets whether quarter pel motion compensation is used.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : TRUE if quarter pel motion compensation is used -
-
-
-
-

-ogmrip_video_set_qpel ()

-
void                ogmrip_video_set_qpel               (OGMRipVideo *video,
-                                                         gboolean qpel);
-

-Sets whether to use quarter pel motion compensation.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
qpel : TRUE to use quarter pel motion compensation -
-
-
-
-

-ogmrip_video_get_quality ()

-
gint                ogmrip_video_get_quality            (OGMRipVideo *video);
-

-Gets the quality of the encoding.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : the OGMRipQualityType, or -1 -
-
-
-
-

-ogmrip_video_set_quality ()

-
void                ogmrip_video_set_quality            (OGMRipVideo *video,
-                                                         OGMRipQualityType quality);
-

-Sets the quality of the encoding.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
quality : the OGMRipQualityType -
-
-
-
-

-ogmrip_video_get_quantizer ()

-
gdouble             ogmrip_video_get_quantizer          (OGMRipVideo *video);
-

-Gets the video quantizer.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : the video quantizer, or -1 -
-
-
-
-

-ogmrip_video_set_quantizer ()

-
void                ogmrip_video_set_quantizer          (OGMRipVideo *video,
-                                                         gdouble quantizer);
-

-Sets the video quantizer to be used, 1 being the lowest and 31 the highest -available quantizers.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
quantizer : the video quantizer -
-
-
-
-

-ogmrip_video_get_raw_size ()

-
void                ogmrip_video_get_raw_size           (OGMRipVideo *video,
-                                                         guint *width,
-                                                         guint *height);
-

-Gets the raw size of the video.

-

- -

-
-- - - - - - - - - - - - - - -
video : an OGMRipVideo -
width : a pointer to store the width -
height : a pointer to store the height -
-
-
-
-

-ogmrip_video_get_scale_size ()

-
gboolean            ogmrip_video_get_scale_size         (OGMRipVideo *video,
-                                                         guint *width,
-                                                         guint *height);
-

-Gets whether the video will be scaled and the scale size.

-

- -

-
-- - - - - - - - - - - - - - - - - - -
video : an OGMRipVideo -
width : a pointer to store the scaled width -
height : a pointer to store the scaled height -
Returns : TRUE if the video will be scaled -
-
-
-
-

-ogmrip_video_set_scale_size ()

-
void                ogmrip_video_set_scale_size         (OGMRipVideo *video,
-                                                         guint width,
-                                                         guint height);
-

-Sets the scaled size of the movie.

-

- -

-
-- - - - - - - - - - - - - - -
video : an OGMRipVideo -
width : the scaled width -
height : the scaled height -
-
-
-
-

-ogmrip_video_get_scaler ()

-
gint                ogmrip_video_get_scaler             (OGMRipVideo *video);
-

-Gets the current software scaler.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : the software scaler, or -1 -
-
-
-
-

-ogmrip_video_set_scaler ()

-
void                ogmrip_video_set_scaler             (OGMRipVideo *video,
-                                                         OGMRipScalerType scaler);
-

-Sets the software scaler to be used.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
scaler : an OGMRipScalerType -
-
-
-
-

-ogmrip_video_get_threads ()

-
gint                ogmrip_video_get_threads            (OGMRipVideo *video);
-

-Gets the number of threads.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : the number of threads, or -1 -
-
-
-
-

-ogmrip_video_set_threads ()

-
void                ogmrip_video_set_threads            (OGMRipVideo *video,
-                                                         guint threads);
-

-Sets the number of threads to be used.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
threads : the number of threads -
-
-
-
-

-ogmrip_video_get_trellis ()

-
gboolean            ogmrip_video_get_trellis            (OGMRipVideo *video);
-

-Gets whether trellis quantization is enabled.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : TRUE if trellis quantization is enabled -
-
-
-
-

-ogmrip_video_set_trellis ()

-
void                ogmrip_video_set_trellis            (OGMRipVideo *video,
-                                                         gboolean trellis);
-

-Sets whether trellis quantization will be enabled.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
trellis : TRUE to enable trellis quantization -
-
-
-
-

-ogmrip_video_get_turbo ()

-
gboolean            ogmrip_video_get_turbo              (OGMRipVideo *video);
-

-Gets whether turbo is enabled.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
Returns : TRUE if turbo is enabled -
-
-
-
-

-ogmrip_video_set_turbo ()

-
void                ogmrip_video_set_turbo              (OGMRipVideo *video,
-                                                         gboolean turbo);
-

-Sets whether to enable turbo.

-

- -

-
-- - - - - - - - - - -
video : an OGMRipVideo -
turbo : TRUE to enable turbo -
-
-
-
- - diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/style.css /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/style.css --- ogmrip-0.11.1/docs/reference/ogmrip/html/style.css 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/style.css 2008-09-28 19:28:17.000000000 +0200 @@ -1,16 +1,16 @@ -.synopsis, .classsynopsis +.synopsis, .classsynopsis { background: #eeeeee; border: solid 1px #aaaaaa; padding: 0.5em; } -.programlisting +.programlisting { background: #eeeeff; border: solid 1px #aaaaff; padding: 0.5em; } -.variablelist +.variablelist { padding: 4px; margin-left: 3em; @@ -19,62 +19,93 @@ { vertical-align: top; } + /* this is needed so that the local anchors are displayed below the naviagtion */ -div.refnamediv a[name], div.refsect1 a[name] -{ - position: relative; - top: -4.5em; -} -table.navigation#top -{ - background: #ffeeee; - border: solid 1px #ffaaaa; - margin-top: 0; - margin-bottom: 0; - position: fixed; - top: 0; - left: 0; - height: 2em; - z-index: 1; +@media screen { + sup a.footnote + { + position: relative; + top: 0em ! important; + } + div.refnamediv a[name], div.refsect1 a[name] + { + position: relative; + top: -4.5em; + } + table.navigation#top + { + background: #ffeeee; + border: solid 1px #ffaaaa; + margin-top: 0; + margin-bottom: 0; + position: fixed; + top: 0; + left: 0; + height: 2em; + z-index: 1; + } + .navigation a + { + color: #770000; + } + .navigation a:visited + { + color: #550000; + } + td.shortcuts + { + color: #770000; + font-size: 80%; + } + div.refentry, div.chapter, div.reference, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface + { + position: relative; + top: 3em; + z-index: 0; + } + div.refnamediv + { + margin-top: 2em; + } + body + { + padding-bottom: 20em; + } +} +@media print { + table.navigation { + visibility: collapse; + display: none; + } + div.titlepage table.navigation { + visibility: visible; + display: table; + background: #ffeeee; + border: solid 1px #ffaaaa; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + height: 2em; + } } -.navigation a -{ - color: #770000; -} -.navigation a:visited -{ - color: #550000; -} -.navigation .title + +.navigation .title { font-size: 200%; } -td.shortcuts -{ - color: #770000; - font-size: 80%; -} -div.refentry, div.chapter, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface -{ - position: relative; - top: 3em; - z-index: 0; -} -div.refnamediv -{ - margin-top: 2em; -} -div.gallery-float + +div.gallery-float { float: left; padding: 10px; } -div.gallery-float img +div.gallery-float img { border-style: none; } -div.gallery-spacer +div.gallery-spacer { clear: both; } @@ -110,3 +141,20 @@ { background-color: #eeeeee; } + +hr +{ + color: #777777; + background: #777777; + border: 0; + height: 1px; + clear: both; +} + +.footer +{ + padding-top: 3.5em; + color: #777777; + text-align: center; + font-size: 80%; +} diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/subp-codecs.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/subp-codecs.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/subp-codecs.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/subp-codecs.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + Subtitles Codecs - + - + - + - - + + - + @@ -33,12 +33,15 @@ Subtitles Codecs
-OGMRipSrt — A subtitles codec to extract in SubRip Text +OGMRipSrt — A subtitles codec to extract in SubRip Text
-OGMRipVobSub — A subtitles codec to extract in VobSub +OGMRipVobSub — A subtitles codec to extract in VobSub
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/html/video-codecs.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/html/video-codecs.html --- ogmrip-0.11.1/docs/reference/ogmrip/html/video-codecs.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/html/video-codecs.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,20 +1,20 @@ - + Video Codecs - + - + - - + + - - + + - + @@ -26,25 +26,28 @@ Up Home OGMRip Reference Manual -Next +Next

Video Codecs

-OGMRipLavc — A video codec to encode in Mpeg4 +OGMRipLavcMpeg4
-OGMRipTheora — A video codec to encode in theora +OGMRipTheora — A video codec to encode in theora
-OGMRipX264 — A video codec to encode in X264 +OGMRipX264 — A video codec to encode in X264
-OGMRipXvid — A video codec to encode in XviD +OGMRipXvid — A video codec to encode in XviD
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/Makefile.am /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/Makefile.am --- ogmrip-0.11.1/docs/reference/ogmrip/Makefile.am 2007-10-07 21:03:53.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/Makefile.am 2008-06-09 21:01:10.000000000 +0200 @@ -9,20 +9,20 @@ HFILE_GLOB = $(top_srcdir)/libogmrip/*.h CFILE_GLOB = $(top_srcdir)/libogmrip/*.c -IGNORE_HFILES = ogmrip.h ogmrip-mplayer.h +IGNORE_HFILES = ogmrip.h # SCAN_OPTIONS = --ignore-headers="ogmrip-file.h $(IGNORE_HFILES)" include $(top_srcdir)/gtk-doc.make CFLAGS = \ - $(OGMRIP_CFLAGS) \ + $(OGMRIP_CFLAGS) \ -I$(top_srcdir)/libogmdvd \ -I$(top_srcdir)/libogmjob \ -I$(top_srcdir)/libogmrip LDFLAGS = \ - $(OGMRIP_LIBS) \ - $(top_builddir)/libogmdvd/libogmdvd.la \ - $(top_builddir)/libogmjob/libogmjob.la \ - $(top_builddir)/libogmrip/libogmrip.la + $(OGMRIP_LIBS) \ + $(top_builddir)/libogmdvd/libogmdvd.la \ + $(top_builddir)/libogmjob/libogmjob.la \ + $(top_builddir)/libogmrip/libogmrip.la diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/Makefile.in /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/Makefile.in --- ogmrip-0.11.1/docs/reference/ogmrip/Makefile.in 2007-10-21 21:05:56.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/Makefile.in 2008-09-21 14:16:35.000000000 +0200 @@ -45,8 +45,7 @@ $(top_srcdir)/gtk-doc.make subdir = docs/reference/ogmrip ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -72,7 +71,7 @@ # SCAN_OPTIONS = --ignore-headers="ogmrip-file.h $(IGNORE_HFILES)" CFLAGS = \ - $(OGMRIP_CFLAGS) \ + $(OGMRIP_CFLAGS) \ -I$(top_srcdir)/libogmdvd \ -I$(top_srcdir)/libogmjob \ -I$(top_srcdir)/libogmrip @@ -87,6 +86,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ DVDREAD_LIBS = @DVDREAD_LIBS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -100,7 +100,6 @@ ENCHANT_LIBS = @ENCHANT_LIBS@ EXEEXT = @EXEEXT@ F77 = @F77@ -FAAC_PROG = @FAAC_PROG@ FFLAGS = @FFLAGS@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ @@ -111,8 +110,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GOCR_PROG = @GOCR_PROG@ GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ GUI_CFLAGS = @GUI_CFLAGS@ @@ -121,24 +120,38 @@ HAL_LIBS = @HAL_LIBS@ HAVE_AAC_SUPPORT_FALSE = @HAVE_AAC_SUPPORT_FALSE@ HAVE_AAC_SUPPORT_TRUE = @HAVE_AAC_SUPPORT_TRUE@ -HAVE_DTS_SUPPORT_FALSE = @HAVE_DTS_SUPPORT_FALSE@ -HAVE_DTS_SUPPORT_TRUE = @HAVE_DTS_SUPPORT_TRUE@ HAVE_ENCHANT_SUPPORT_FALSE = @HAVE_ENCHANT_SUPPORT_FALSE@ HAVE_ENCHANT_SUPPORT_TRUE = @HAVE_ENCHANT_SUPPORT_TRUE@ HAVE_GTK_SUPPORT_FALSE = @HAVE_GTK_SUPPORT_FALSE@ HAVE_GTK_SUPPORT_TRUE = @HAVE_GTK_SUPPORT_TRUE@ +HAVE_LAVC_SUPPORT_FALSE = @HAVE_LAVC_SUPPORT_FALSE@ +HAVE_LAVC_SUPPORT_TRUE = @HAVE_LAVC_SUPPORT_TRUE@ HAVE_LAVF_SUPPORT_FALSE = @HAVE_LAVF_SUPPORT_FALSE@ HAVE_LAVF_SUPPORT_TRUE = @HAVE_LAVF_SUPPORT_TRUE@ HAVE_MKV_SUPPORT_FALSE = @HAVE_MKV_SUPPORT_FALSE@ HAVE_MKV_SUPPORT_TRUE = @HAVE_MKV_SUPPORT_TRUE@ +HAVE_MP3_SUPPORT_FALSE = @HAVE_MP3_SUPPORT_FALSE@ +HAVE_MP3_SUPPORT_TRUE = @HAVE_MP3_SUPPORT_TRUE@ +HAVE_MP4_SUPPORT_FALSE = @HAVE_MP4_SUPPORT_FALSE@ +HAVE_MP4_SUPPORT_TRUE = @HAVE_MP4_SUPPORT_TRUE@ +HAVE_OGM_SUPPORT_FALSE = @HAVE_OGM_SUPPORT_FALSE@ +HAVE_OGM_SUPPORT_TRUE = @HAVE_OGM_SUPPORT_TRUE@ +HAVE_PNG_SUPPORT_FALSE = @HAVE_PNG_SUPPORT_FALSE@ +HAVE_PNG_SUPPORT_TRUE = @HAVE_PNG_SUPPORT_TRUE@ HAVE_SRT_SUPPORT_FALSE = @HAVE_SRT_SUPPORT_FALSE@ HAVE_SRT_SUPPORT_TRUE = @HAVE_SRT_SUPPORT_TRUE@ HAVE_THEORA_SUPPORT_FALSE = @HAVE_THEORA_SUPPORT_FALSE@ HAVE_THEORA_SUPPORT_TRUE = @HAVE_THEORA_SUPPORT_TRUE@ +HAVE_TIFF_SUPPORT_FALSE = @HAVE_TIFF_SUPPORT_FALSE@ +HAVE_TIFF_SUPPORT_TRUE = @HAVE_TIFF_SUPPORT_TRUE@ +HAVE_VORBIS_SUPPORT_FALSE = @HAVE_VORBIS_SUPPORT_FALSE@ +HAVE_VORBIS_SUPPORT_TRUE = @HAVE_VORBIS_SUPPORT_TRUE@ HAVE_X264_SUPPORT_FALSE = @HAVE_X264_SUPPORT_FALSE@ HAVE_X264_SUPPORT_TRUE = @HAVE_X264_SUPPORT_TRUE@ HAVE_XSLTPROC_PROG_FALSE = @HAVE_XSLTPROC_PROG_FALSE@ HAVE_XSLTPROC_PROG_TRUE = @HAVE_XSLTPROC_PROG_TRUE@ +HAVE_XVID_SUPPORT_FALSE = @HAVE_XVID_SUPPORT_FALSE@ +HAVE_XVID_SUPPORT_TRUE = @HAVE_XVID_SUPPORT_TRUE@ HTML_DIR = @HTML_DIR@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -150,14 +163,12 @@ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_ICONV = @INTLTOOL_ICONV@ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -169,21 +180,24 @@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -LAME_PROG = @LAME_PROG@ LDFLAGS = \ - $(OGMRIP_LIBS) \ - $(top_builddir)/libogmdvd/libogmdvd.la \ - $(top_builddir)/libogmjob/libogmjob.la \ - $(top_builddir)/libogmrip/libogmrip.la + $(OGMRIP_LIBS) \ + $(top_builddir)/libogmdvd/libogmdvd.la \ + $(top_builddir)/libogmjob/libogmjob.la \ + $(top_builddir)/libogmrip/libogmrip.la LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ +LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBTIFF_LIBS = @LIBTIFF_LIBS@ LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -192,21 +206,15 @@ MAKEINFO = @MAKEINFO@ MENCODER_PROG = @MENCODER_PROG@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MKVMERGE_PROG = @MKVMERGE_PROG@ -MPLAYER_MAJOR_VERSION = @MPLAYER_MAJOR_VERSION@ -MPLAYER_MINOR_VERSION = @MPLAYER_MINOR_VERSION@ -MPLAYER_PRE_VERSION = @MPLAYER_PRE_VERSION@ MPLAYER_PROG = @MPLAYER_PROG@ -MPLAYER_RC_VERSION = @MPLAYER_RC_VERSION@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ -OCRAD_PROG = @OCRAD_PROG@ -OGGENC_PROG = @OGGENC_PROG@ OGMDVD_GTK_LT_VERSION = @OGMDVD_GTK_LT_VERSION@ OGMDVD_LT_VERSION = @OGMDVD_LT_VERSION@ OGMJOB_LT_VERSION = @OGMJOB_LT_VERSION@ -OGMMERGE_PROG = @OGMMERGE_PROG@ OGMRIP_CFLAGS = @OGMRIP_CFLAGS@ OGMRIP_GTK_LT_VERSION = @OGMRIP_GTK_LT_VERSION@ OGMRIP_LIBS = @OGMRIP_LIBS@ @@ -215,7 +223,6 @@ OGMRIP_MICRO_VERSION = @OGMRIP_MICRO_VERSION@ OGMRIP_MINOR_VERSION = @OGMRIP_MINOR_VERSION@ OGMRIP_VERSION = @OGMRIP_VERSION@ -OGMSPLIT_PROG = @OGMSPLIT_PROG@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -293,11 +300,11 @@ DOC_SOURCE_DIR = ../../../libogmrip HFILE_GLOB = $(top_srcdir)/libogmrip/*.h CFILE_GLOB = $(top_srcdir)/libogmrip/*.c -IGNORE_HFILES = ogmrip.h ogmrip-mplayer.h -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +IGNORE_HFILES = ogmrip.h +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) # We set GPATH here; this gives us semantics for GNU make # which are more like other make's VPATH, when it comes to @@ -323,7 +330,12 @@ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals -CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS) +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) all: all-am .SUFFIXES: @@ -439,7 +451,8 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic distclean-libtool \ + distclean-local dvi: dvi-am @@ -482,9 +495,9 @@ .PHONY: all all-am all-local check check-am clean clean-generic \ clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-local install-exec \ + distclean-generic distclean-libtool distclean-local distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic \ @@ -529,6 +542,9 @@ tmpl.stamp: tmpl-build.stamp @true +tmpl/*.sgml: + @true + #### xml #### sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) @@ -546,11 +562,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Building HTML' @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html + rm -rf $(srcdir)/html mkdir $(srcdir)/html cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' + @echo 'gtk-doc: Fixing cross-references' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp @@ -560,11 +576,16 @@ rm -f *~ *.bak rm -rf .libs +distclean-local: + cd $(srcdir) && \ + rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + cd $(srcdir) && rm -rf xml html install-data-local: - installfiles=`echo $(srcdir)/html/*`; \ + -installfiles=`echo $(srcdir)/html/*`; \ if test "$$installfiles" = '$(srcdir)/html/*'; \ then echo '-- Nothing to install' ; \ else \ @@ -575,6 +596,8 @@ done; \ echo '-- Installing $(srcdir)/html/index.sgml' ; \ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + which gtkdoc-rebase >/dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ fi uninstall-local: @@ -595,9 +618,10 @@ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/xml/*.xml $(distdir)/xml cp $(srcdir)/html/* $(distdir)/html - if test -f $(srcdir)/$(DOC_MODULE).types; then \ - cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \ - fi + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/ogmrip-sections.txt /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/ogmrip-sections.txt --- ogmrip-0.11.1/docs/reference/ogmrip/ogmrip-sections.txt 2007-10-07 21:03:53.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/ogmrip-sections.txt 2008-09-28 19:28:17.000000000 +0200 @@ -43,6 +43,7 @@ ogmrip_audio_file_get_length ogmrip_audio_file_get_sample_rate ogmrip_audio_file_get_samples_per_frame +ogmrip_audio_file_get_channels ogmrip_subp_file_new ogmrip_subp_file_get_charset @@ -81,24 +82,24 @@
-ogmrip-subp -OGMRipSubp -OGMRipSubp -ogmrip_subp_set_dvd_subp_stream -ogmrip_subp_get_dvd_subp_stream -ogmrip_subp_get_charset -ogmrip_subp_set_charset -ogmrip_subp_get_eol_style -ogmrip_subp_set_eol_style -ogmrip_subp_get_forced_only -ogmrip_subp_set_forced_only - -OGMRIP_SUBP -OGMRIP_IS_SUBP -OGMRIP_TYPE_SUBP -ogmrip_subp_get_type -OGMRIP_SUBP_CLASS -OGMRIP_IS_SUBP_CLASS +ogmrip-subp-codec +OGMRipSubpCodec +OGMRipSubpCodec +ogmrip_subp_codec_set_dvd_subp_stream +ogmrip_subp_codec_get_dvd_subp_stream +ogmrip_subp_codec_get_charset +ogmrip_subp_codec_set_charset +ogmrip_subp_codec_get_eol_style +ogmrip_subp_codec_set_eol_style +ogmrip_subp_codec_get_forced_only +ogmrip_subp_codec_set_forced_only + +OGMRIP_SUBP_CODEC +OGMRIP_IS_SUBP_CODEC +OGMRIP_TYPE_SUBP_CODEC +ogmrip_subp_codec_get_type +OGMRIP_SUBP_CODEC_CLASS +OGMRIP_IS_SUBP_CODEC_CLASS
@@ -137,6 +138,9 @@ ogmrip_container_foreach_file ogmrip_container_set_split ogmrip_container_get_split +ogmrip_container_get_start_delay +ogmrip_container_set_start_delay +ogmrip_container_get_overhead ogmrip_container_get_overhead_size ogmrip_container_get_nonvideo_size @@ -216,6 +220,11 @@ ogmrip_codec_get_input ogmrip_codec_set_input ogmrip_codec_get_length +ogmrip_codec_get_frames +ogmrip_codec_get_telecine +ogmrip_codec_set_telecine +ogmrip_codec_get_progressive +ogmrip_codec_set_progressive ogmrip_codec_set_edl ogmrip_codec_get_edl ogmrip_codec_set_chapters @@ -250,17 +259,56 @@
+ogmrip-lavc-mpeg4 +OGMRipLavcMpeg4 +OGMRipLavcMpeg4 +ogmrip_lavc_mpeg4_new + +OGMRIP_LAVC_MPEG4 +OGMRIP_IS_LAVC_MPEG4 +OGMRIP_TYPE_LAVC_MPEG4 +ogmrip_lavc_mpeg4_get_type +OGMRIP_LAVC_MPEG4_CLASS +OGMRIP_IS_LAVC_MPEG4_CLASS +
+ +
ogmrip-lavc OGMRipLavc OGMRipLavc OGMRipLavcHeaderType -ogmrip_lavc_new ogmrip_lavc_set_cmp ogmrip_lavc_get_cmp ogmrip_lavc_set_dia ogmrip_lavc_get_dia ogmrip_lavc_set_header ogmrip_lavc_get_header +ogmrip_lavc_set_buf_size +ogmrip_lavc_get_buf_size +ogmrip_lavc_set_dc +ogmrip_lavc_get_dc +ogmrip_lavc_set_keyint +ogmrip_lavc_get_keyint +ogmrip_lavc_set_last_pred +ogmrip_lavc_get_last_pred +ogmrip_lavc_set_max_rate +ogmrip_lavc_get_max_rate +ogmrip_lavc_set_mbd +ogmrip_lavc_get_mbd +ogmrip_lavc_set_min_rate +ogmrip_lavc_get_min_rate +ogmrip_lavc_set_mv0 +ogmrip_lavc_get_mv0 +ogmrip_lavc_set_preme +ogmrip_lavc_get_preme +ogmrip_lavc_set_qns +ogmrip_lavc_get_qns +ogmrip_lavc_set_strict +ogmrip_lavc_get_strict +ogmrip_lavc_set_vb_strategy +ogmrip_lavc_get_vb_strategy +ogmrip_lavc_set_vqcomp +ogmrip_lavc_get_vqcomp OGMRIP_LAVC OGMRIP_IS_LAVC @@ -285,68 +333,69 @@
-ogmrip-video -OGMRipVideo -OGMRipVideo -ogmrip_video_autocrop -ogmrip_video_autoscale -ogmrip_video_autobitrate -ogmrip_video_get_4mv -ogmrip_video_set_4mv -ogmrip_video_get_angle -ogmrip_video_set_angle -ogmrip_video_get_bitrate -ogmrip_video_set_bitrate -ogmrip_video_get_bits_per_pixel -ogmrip_video_set_bits_per_pixel -ogmrip_video_get_cartoon -ogmrip_video_set_cartoon -ogmrip_video_get_crop_size -ogmrip_video_set_crop_size -ogmrip_video_get_deblock -ogmrip_video_set_deblock -ogmrip_video_get_deinterlacer -ogmrip_video_set_deinterlacer -ogmrip_video_get_denoise -ogmrip_video_set_denoise -ogmrip_video_get_dering -ogmrip_video_set_dering -ogmrip_video_get_ensure_sync -ogmrip_video_set_ensure_sync -ogmrip_video_get_grayscale -ogmrip_video_set_grayscale -ogmrip_video_get_log -ogmrip_video_set_log -ogmrip_video_get_max_b_frames -ogmrip_video_set_max_b_frames -ogmrip_video_get_pass -ogmrip_video_set_pass -ogmrip_video_get_pullup -ogmrip_video_set_pullup -ogmrip_video_get_qpel -ogmrip_video_set_qpel -ogmrip_video_get_quality -ogmrip_video_set_quality -ogmrip_video_get_quantizer -ogmrip_video_set_quantizer -ogmrip_video_get_raw_size -ogmrip_video_get_scale_size -ogmrip_video_set_scale_size -ogmrip_video_get_scaler -ogmrip_video_set_scaler -ogmrip_video_get_threads -ogmrip_video_set_threads -ogmrip_video_get_trellis -ogmrip_video_set_trellis -ogmrip_video_get_turbo -ogmrip_video_set_turbo - -OGMRIP_VIDEO -OGMRIP_IS_VIDEO -OGMRIP_TYPE_VIDEO -ogmrip_video_get_type -OGMRIP_VIDEO_CLASS -OGMRIP_IS_VIDEO_CLASS +ogmrip-video-codec +OGMRipVideoCodec +OGMRipVideoCodec +ogmrip_video_codec_autocrop +ogmrip_video_codec_autoscale +ogmrip_video_codec_autobitrate +ogmrip_video_codec_get_4mv +ogmrip_video_codec_set_4mv +ogmrip_video_codec_get_angle +ogmrip_video_codec_set_angle +ogmrip_video_codec_get_bitrate +ogmrip_video_codec_set_bitrate +ogmrip_video_codec_get_bits_per_pixel +ogmrip_video_codec_set_bits_per_pixel +ogmrip_video_codec_get_cartoon +ogmrip_video_codec_set_cartoon +ogmrip_video_codec_get_crop_size +ogmrip_video_codec_set_crop_size +ogmrip_video_codec_get_deblock +ogmrip_video_codec_set_deblock +ogmrip_video_codec_get_deinterlacer +ogmrip_video_codec_set_deinterlacer +ogmrip_video_codec_get_denoise +ogmrip_video_codec_set_denoise +ogmrip_video_codec_get_dering +ogmrip_video_codec_set_dering +ogmrip_video_codec_get_ensure_sync +ogmrip_video_codec_set_ensure_sync +ogmrip_video_codec_get_expand_size +ogmrip_video_codec_set_expand_size +ogmrip_video_codec_get_grayscale +ogmrip_video_codec_set_grayscale +ogmrip_video_codec_get_max_b_frames +ogmrip_video_codec_set_max_b_frames +ogmrip_video_codec_get_max_size +ogmrip_video_codec_set_max_size +ogmrip_video_codec_get_passes +ogmrip_video_codec_set_passes +ogmrip_video_codec_get_qpel +ogmrip_video_codec_set_qpel +ogmrip_video_codec_get_quality +ogmrip_video_codec_set_quality +ogmrip_video_codec_get_quantizer +ogmrip_video_codec_set_quantizer +ogmrip_video_codec_get_raw_size +ogmrip_video_codec_get_scale_size +ogmrip_video_codec_set_scale_size +ogmrip_video_codec_get_scaler +ogmrip_video_codec_set_scaler +ogmrip_video_codec_get_threads +ogmrip_video_codec_set_threads +ogmrip_video_codec_get_trellis +ogmrip_video_codec_set_trellis +ogmrip_video_codec_get_turbo +ogmrip_video_codec_set_turbo +ogmrip_video_codec_get_start_delay + +OGMRIP_VIDEO_CODEC +OGMRIP_IS_VIDEO_CODEC +OGMRIP_TYPE_VIDEO_CODEC +ogmrip_video_codec_get_type +OGMRIP_VIDEO_CODEC_CLASS +OGMRIP_IS_VIDEO_CODEC_CLASS
@@ -422,29 +471,29 @@
-ogmrip-audio -OGMRipAudio -OGMRipAudio -ogmrip_audio_get_dvd_audio_stream -ogmrip_audio_set_dvd_audio_stream -ogmrip_audio_get_channels -ogmrip_audio_set_channels -ogmrip_audio_get_fast -ogmrip_audio_set_fast -ogmrip_audio_get_normalize -ogmrip_audio_set_normalize -ogmrip_audio_get_quality -ogmrip_audio_set_quality -ogmrip_audio_get_sample_rate -ogmrip_audio_set_sample_rate -ogmrip_audio_get_samples_per_frame - -OGMRIP_AUDIO -OGMRIP_IS_AUDIO -OGMRIP_TYPE_AUDIO -ogmrip_audio_get_type -OGMRIP_AUDIO_CLASS -OGMRIP_IS_AUDIO_CLASS +ogmrip-audio-codec +OGMRipAudioCodec +OGMRipAudioCodec +ogmrip_audio_codec_get_dvd_audio_stream +ogmrip_audio_codec_set_dvd_audio_stream +ogmrip_audio_codec_get_channels +ogmrip_audio_codec_set_channels +ogmrip_audio_codec_get_fast +ogmrip_audio_codec_set_fast +ogmrip_audio_codec_get_normalize +ogmrip_audio_codec_set_normalize +ogmrip_audio_codec_get_quality +ogmrip_audio_codec_set_quality +ogmrip_audio_codec_get_sample_rate +ogmrip_audio_codec_set_sample_rate +ogmrip_audio_codec_get_samples_per_frame + +OGMRIP_AUDIO_CODEC +OGMRIP_IS_AUDIO_CODEC +OGMRIP_TYPE_AUDIO_CODEC +ogmrip_audio_codec_get_type +OGMRIP_AUDIO_CODEC_CLASS +OGMRIP_IS_AUDIO_CODEC_CLASS
@@ -491,8 +540,7 @@
ogmrip-fs -OGMRipFsError -OGMRIP_FS_ERROR +ogmrip_fs_unref ogmrip_fs_get_tmp_dir ogmrip_fs_set_tmp_dir ogmrip_fs_mkdir @@ -504,19 +552,20 @@ ogmrip_fs_open_tmp ogmrip_fs_get_left_space ogmrip_fs_get_mount_point -ogmrip_fs_unref +ogmrip_fs_get_extension +ogmrip_fs_set_extension ogmrip_fs_rename
ogmrip-version +ogmrip_check_mencoder +ogmrip_check_mplayer +ogmrip_check_mplayer_dts +ogmrip_check_mplayer_version OGMRIP_MAJOR_VERSION OGMRIP_MINOR_VERSION OGMRIP_MICRO_VERSION -MPLAYER_MAJOR_VERSION -MPLAYER_MINOR_VERSION -MPLAYER_PRE_VERSION -MPLAYER_RC_VERSION OGMRIP_CHECK_VERSION MPLAYER_CHECK_VERSION
@@ -537,10 +586,10 @@
ogmrip-plugin -OGMRipPluginVideoCodec -OGMRipPluginAudioCodec -OGMRipPluginSubpCodec -OGMRipPluginContainer +OGMRipVideoPlugin +OGMRipAudioPlugin +OGMRipSubpPlugin +OGMRipContainerPlugin OGMRipPluginFunc OGMRipPluginCmpFunc ogmrip_plugin_init @@ -554,6 +603,7 @@ ogmrip_plugin_get_container_bframes ogmrip_plugin_get_container_max_audio ogmrip_plugin_get_container_max_subp +ogmrip_plugin_get_container_by_name ogmrip_plugin_get_n_video_codecs ogmrip_plugin_foreach_video_codec ogmrip_plugin_find_video_codec @@ -563,6 +613,7 @@ ogmrip_plugin_get_video_codec_format ogmrip_plugin_get_video_codec_passes ogmrip_plugin_get_video_codec_threads +ogmrip_plugin_get_video_codec_by_name ogmrip_plugin_get_n_audio_codecs ogmrip_plugin_foreach_audio_codec ogmrip_plugin_find_audio_codec @@ -570,6 +621,7 @@ ogmrip_plugin_get_audio_codec_name ogmrip_plugin_get_audio_codec_index ogmrip_plugin_get_audio_codec_format +ogmrip_plugin_get_audio_codec_by_name ogmrip_plugin_get_n_subp_codecs ogmrip_plugin_foreach_subp_codec ogmrip_plugin_find_subp_codec @@ -578,6 +630,7 @@ ogmrip_plugin_get_subp_codec_index ogmrip_plugin_get_subp_codec_format ogmrip_plugin_get_subp_codec_text +ogmrip_plugin_get_subp_codec_by_name ogmrip_plugin_can_contain_video ogmrip_plugin_can_contain_audio ogmrip_plugin_can_contain_subp @@ -587,6 +640,21 @@
+ogmrip-mplayer +ogmrip_mencoder_audio_command +ogmrip_mencoder_codec_watch +ogmrip_mencoder_container_command +ogmrip_mencoder_container_watch +ogmrip_mencoder_video_command +ogmrip_mencoder_vobsub_command +ogmrip_mencoder_vobsub_watch +ogmrip_mplayer_video_command +ogmrip_mplayer_video_watch +ogmrip_mplayer_wav_command +ogmrip_mplayer_wav_watch +
+ +
ogmrip-enums OGMRipFormatType OGMRipScalerType diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/ogmrip.types /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/ogmrip.types --- ogmrip-0.11.1/docs/reference/ogmrip/ogmrip.types 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/ogmrip.types 2008-09-28 19:28:17.000000000 +0200 @@ -1,9 +1,9 @@ #include -ogmrip_audio_get_type +ogmrip_audio_codec_get_type ogmrip_chapters_get_type ogmrip_codec_get_type ogmrip_container_get_type ogmrip_dvdcpy_get_type -ogmrip_subp_get_type -ogmrip_video_get_type +ogmrip_subp_codec_get_type +ogmrip_video_codec_get_type diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/ogmrip.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/ogmrip.xml --- ogmrip-0.11.1/docs/reference/ogmrip/ogmrip.xml 2007-10-07 21:03:53.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/ogmrip.xml 2008-06-09 21:01:10.000000000 +0200 @@ -16,6 +16,7 @@ + @@ -27,10 +28,11 @@ Abstract Base Classes - - - + + + + Misceleanous @@ -54,7 +56,7 @@ Video Codecs - + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-aac.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-aac.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-aac.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-aac.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -23,7 +23,6 @@ @parent_instance: -@priv: diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-acopy.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-acopy.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-acopy.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-acopy.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -23,7 +23,6 @@ @parent_instance: -@priv: diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-audio-codec.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-audio-codec.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-audio-codec.sgml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-audio-codec.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,172 @@ + +OGMRipAudioCodec + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@audio: +@Returns: + + + + + + + +@audio: +@stream: + + + + + + + +@audio: +@Returns: + + + + + + + +@audio: +@channels: + + + + + + + +@audio: +@Returns: + + + + + + + +@audio: +@fast: + + + + + + + +@audio: +@Returns: + + + + + + + +@audio: +@normalize: + + + + + + + +@audio: +@Returns: + + + + + + + +@audio: +@quality: + + + + + + + +@audio: +@Returns: + + + + + + + +@audio: +@srate: + + + + + + + +@audio: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-audio.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-audio.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-audio.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-audio.sgml 1970-01-01 01:00:00.000000000 +0100 @@ -1,172 +0,0 @@ - -OGMRipAudio - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@audio: -@Returns: - - - - - - - -@audio: -@stream: - - - - - - - -@audio: -@Returns: - - - - - - - -@audio: -@channels: - - - - - - - -@audio: -@Returns: - - - - - - - -@audio: -@fast: - - - - - - - -@audio: -@Returns: - - - - - - - -@audio: -@normalize: - - - - - - - -@audio: -@Returns: - - - - - - - -@audio: -@quality: - - - - - - - -@audio: -@Returns: - - - - - - - -@audio: -@srate: - - - - - - - -@audio: -@Returns: - - diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-avi.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-avi.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-avi.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-avi.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -23,7 +23,6 @@ @parent_instance: -@priv: diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-codec.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-codec.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-codec.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-codec.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -109,6 +109,51 @@ @Returns: + + + + + +@codec: +@Returns: + + + + + + + +@codec: +@Returns: + + + + + + + +@codec: +@telecine: + + + + + + + +@codec: +@Returns: + + + + + + + +@codec: +@progressive: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-container.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-container.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-container.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-container.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -365,6 +365,33 @@ @size: + + + + + +@container: +@Returns: + + + + + + + +@container: +@start_delay: + + + + + + + +@container: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-enums.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-enums.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-enums.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-enums.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -22,6 +22,8 @@ +@OGMRIP_FORMAT_MPEG1: +@OGMRIP_FORMAT_MPEG2: @OGMRIP_FORMAT_MPEG4: @OGMRIP_FORMAT_H264: @OGMRIP_FORMAT_THEORA: @@ -85,9 +87,9 @@ -@OGMRIP_QUALITY_VERY_HIGH: +@OGMRIP_QUALITY_EXTREME: @OGMRIP_QUALITY_HIGH: -@OGMRIP_QUALITY_FAST: +@OGMRIP_QUALITY_NORMAL: diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-file.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-file.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-file.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-file.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -245,6 +245,15 @@ @Returns: + + + + + +@audio: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-fs.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-fs.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-fs.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-fs.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -17,19 +17,13 @@ - - - - - -@OGMRIP_FS_ERROR_NONE: -@OGMRIP_FS_ERROR_INTERNAL: - - + +@filename: +@do_unlink: @@ -129,6 +123,7 @@ @filename: +@error: @Returns: @@ -138,16 +133,27 @@ @filename: +@error: @Returns: - + @filename: -@do_unlink: +@Returns: + + + + + + + +@filename: +@extension: +@Returns: diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-lavc-mpeg4.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-lavc-mpeg4.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-lavc-mpeg4.sgml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-lavc-mpeg4.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,36 @@ + +OGMRipLavcMpeg4 + + + + + + + + + + + + + + + + + + + + + + +@parent_instance: + + + + + + +@title: +@output: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-lavc.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-lavc.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-lavc.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-lavc.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -35,16 +35,6 @@ @OGMRIP_LAVC_HEADER_KEYFRAMES: @OGMRIP_LAVC_HEADER_COMBINE: - - - - - -@title: -@output: -@Returns: - - @@ -105,3 +95,237 @@ @Returns: + + + + + +@lavc: +@buf_size: + + + + + + + +@lavc: +@Returns: + + + + + + + +@lavc: +@dc: + + + + + + + +@lavc: +@Returns: + + + + + + + +@lavc: +@keyint: + + + + + + + +@lavc: +@Returns: + + + + + + + +@lavc: +@last_pred: + + + + + + + +@lavc: +@Returns: + + + + + + + +@lavc: +@max_rate: + + + + + + + +@lavc: +@Returns: + + + + + + + +@lavc: +@mbd: + + + + + + + +@lavc: +@Returns: + + + + + + + +@lavc: +@min_rate: + + + + + + + +@lavc: +@Returns: + + + + + + + +@lavc: +@mv0: + + + + + + + +@lavc: +@Returns: + + + + + + + +@lavc: +@preme: + + + + + + + +@lavc: +@Returns: + + + + + + + +@lavc: +@qns: + + + + + + + +@lavc: +@Returns: + + + + + + + +@lavc: +@strict: + + + + + + + +@lavc: +@Returns: + + + + + + + +@lavc: +@vb_strategy: + + + + + + + +@lavc: +@Returns: + + + + + + + +@lavc: +@vqcomp: + + + + + + + +@lavc: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-mp3.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-mp3.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-mp3.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-mp3.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -23,7 +23,6 @@ @parent_instance: -@priv: diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-mp4.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-mp4.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-mp4.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-mp4.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -23,6 +23,7 @@ @parent_instance: +@priv: diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-mplayer.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-mplayer.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-mplayer.sgml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-mplayer.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,135 @@ + +ogmrip-mplayer + + + + + + + + + + + + + + + + + + + + + + +@audio: +@output: +@Returns: + + + + + + + +@exec: +@buffer: +@codec: +@Returns: + + + + + + + +@container: +@Returns: + + + + + + + +@exec: +@buffer: +@container: +@Returns: + + + + + + + +@video: +@output: +@pass: +@Returns: + + + + + + + +@subp: +@output: +@Returns: + + + + + + + +@exec: +@buffer: +@subp: +@Returns: + + + + + + + +@video: +@output: +@Returns: + + + + + + + +@exec: +@buffer: +@video: +@Returns: + + + + + + + +@audio: +@header: +@output: +@Returns: + + + + + + + +@exec: +@buffer: +@audio: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-ogg.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-ogg.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-ogg.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-ogg.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -23,7 +23,6 @@ @parent_instance: -@priv: diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-plugin.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-plugin.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-plugin.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-plugin.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -17,7 +17,7 @@ - + @@ -30,7 +30,7 @@ @passes: @threads: - + @@ -41,7 +41,7 @@ @description: @format: - + @@ -53,7 +53,7 @@ @format: @text: - + @@ -185,6 +185,15 @@ @Returns: + + + + + +@name: +@Returns: + + @@ -266,6 +275,15 @@ @Returns: + + + + + +@name: +@Returns: + + @@ -329,6 +347,15 @@ @Returns: + + + + + +@name: +@Returns: + + @@ -401,6 +428,15 @@ @Returns: + + + + + +@name: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-subp-codec.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-subp-codec.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-subp-codec.sgml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-subp-codec.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,117 @@ + +OGMRipSubpCodec + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@subp: +@stream: + + + + + + + +@subp: +@Returns: + + + + + + + +@subp: +@Returns: + + + + + + + +@subp: +@charset: + + + + + + + +@subp: +@Returns: + + + + + + + +@subp: +@eol: + + + + + + + +@subp: +@Returns: + + + + + + + +@subp: +@forced_only: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-subp.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-subp.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-subp.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-subp.sgml 1970-01-01 01:00:00.000000000 +0100 @@ -1,117 +0,0 @@ - -OGMRipSubp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@subp: -@stream: - - - - - - - -@subp: -@Returns: - - - - - - - -@subp: -@Returns: - - - - - - - -@subp: -@charset: - - - - - - - -@subp: -@Returns: - - - - - - - -@subp: -@eol: - - - - - - - -@subp: -@Returns: - - - - - - - -@subp: -@forced_only: - - diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-theora.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-theora.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-theora.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-theora.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -23,7 +23,6 @@ @parent_instance: -@priv: diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-unused.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-unused.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-unused.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-unused.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -1,3 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + +OGMRipAudio + + @@ -22,6 +46,54 @@ Compatibility Matrix + + + + + + + + + + + + + + + + + + + + + +OGMRipSubp + + + + + + + + + + + + + + + + + + + + + + + +OGMRipVideo + + @@ -46,6 +118,30 @@ OGMRipXml + + + + + + + + + + + + + + + + + + + + + + + + @@ -60,6 +156,12 @@ @file: + + + + + + @@ -80,6 +182,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -172,6 +316,14 @@ @OGMRIP_FILE_FORMAT_MPL_2: @OGMRIP_FILE_FORMAT_VOBSUB: + + + + + +@OGMRIP_FS_ERROR_NONE: +@OGMRIP_FS_ERROR_INTERNAL: + @@ -200,393 +352,529 @@ - + +@module: +@type: +@name: +@description: +@format: - + +@module: +@type: +@name: +@description: +@bframes: +@max_audio: +@max_subp: +@formats: - + +@module: +@type: +@name: +@description: +@format: +@text: - + +@module: +@type: +@name: +@description: +@format: +@passes: +@threads: - + - + - + - + - + -@parent_instance: -@priv: - + -@type: -@name: -@description: -@data: -@Returns: - + -@type: -@name: -@description: -@data: - + - + - + - + -@audio: -@Returns: - + -@container: -@codec: -@Returns: - + -@container: -@ncodec: -@Returns: - + -@container: -@ncodec: -@Returns: - + -@container: -@codec: -@Returns: - + -@container: -@codec: -@Returns: - + -@Returns: - + -@func: -@data: -@Returns: - + -@func: -@data: -@Returns: - + -@func: -@data: -@Returns: - + -@func: -@data: -@Returns: - + -@func: -@data: - + -@func: -@data: - + -@func: -@data: - + -@func: -@data: - + -@Returns: - + -@codec: -@Returns: - + -@codec: -@Returns: - + -@container: -@Returns: - + -@container: -@Returns: - + -@container: -@Returns: - + -@container: -@Returns: +@parent_instance: +@priv: - + -@container: +@type: +@name: +@description: +@data: @Returns: - + -@Returns: +@type: +@name: +@description: +@data: - + + + + + + + + + + + + + + + + + + + +@audio: @Returns: - + +@audio: @Returns: - + +@audio: @Returns: - + -@n: +@audio: @Returns: - + -@n: +@audio: @Returns: - + -@n: +@audio: @Returns: - + -@n: +@audio: @Returns: - + -@codec: +@audio: @Returns: - + + + + + +@audio: +@channels: + + + + + + +@audio: +@stream: + + + + + + +@audio: +@fast: + + + + + + +@audio: +@normalize: + + + + + + +@audio: +@quality: + + + + + + +@audio: +@srate: + + +@container: @codec: @Returns: - + -@codec: +@container: +@ncodec: @Returns: - + + + + + +@container: +@ncodec: +@Returns: + + +@container: @codec: @Returns: - + +@container: @codec: @Returns: - + + + + + +@Returns: + + + + + + +@func: +@data: +@Returns: + + + + + + +@func: +@data: +@Returns: + + + + + + +@func: +@data: +@Returns: + + + + + + +@func: +@data: +@Returns: + + + + + + +@func: +@data: + + + + + + +@func: +@data: + + + + + + +@func: +@data: + + + + + + +@func: +@data: + + + + + + +@Returns: + + @@ -594,7 +882,7 @@ @codec: @Returns: - + @@ -602,18 +890,719 @@ @codec: @Returns: - + +@container: @Returns: - + + + + + +@container: +@Returns: + + + + + + +@container: +@Returns: + + + + + + +@container: +@Returns: + + + + + + +@container: +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@n: +@Returns: + + + + + + +@n: +@Returns: + + + + + + +@n: +@Returns: + + + + + + +@n: +@Returns: + + + + + + +@codec: +@Returns: + + + + + + +@codec: +@Returns: + + + + + + +@codec: +@Returns: + + + + + + +@codec: +@Returns: + + + + + + +@codec: +@Returns: + + + + + + +@codec: +@Returns: + + + + + + +@codec: +@Returns: + + + + + + +@Returns: + + + + + + +@title: +@output: +@Returns: + + + + + + +@subp: +@Returns: + + + + + + +@subp: +@Returns: + + + + + + +@subp: +@Returns: + + + + + + +@subp: +@Returns: + + + + + + +@subp: +@charset: + + + + + + +@subp: +@stream: + + + + + + +@subp: +@eol: + + + + + + +@subp: +@forced_only: + + + + + + + + + + + + +@video: +@nonvideo_size: +@overhead_size: +@total_size: + + + + + + +@video: +@nframes: +@Returns: + + + + + + +@video: + + + + + + +@video: +@width: +@height: +@Returns: + + + + + + +@video: +@width: +@height: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@x: +@y: +@width: +@height: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@width: +@height: + + + + + + +@video: +@width: +@height: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@Returns: + + + + + + +@video: +@v4mv: + + + + + + +@video: +@angle: + + + + + + +@video: +@bitrate: + + + + + + +@video: +@bpp: + + + + + + +@video: +@cartoon: + + + + + + +@video: +@x: +@y: +@width: +@height: + + + + + + +@video: +@deblock: + + + + + + +@video: +@deint: + + + + + + +@video: +@denoise: + + + + + + +@video: +@dering: + + + + + + +@video: +@stream: + + + + + + +@video: +@grayscale: + + + + + + +@video: +@log: + + + + + + +@video: +@max_b_frames: + + + + + + +@video: +@pass: + + + + + + +@video: +@pass: + + + + + + +@video: +@pullup: + + + + + + +@video: +@qpel: + + + + + + +@video: +@quality: + + + + + + +@video: +@quantizer: + + + + + + +@video: +@width: +@height: + + + + + + +@video: +@scaler: + + + + + + +@video: +@threads: + + + + + + +@video: +@trellis: + + +@video: +@turbo: diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-version.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-version.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-version.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-version.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -17,49 +17,57 @@ - + +@Returns: - + +@Returns: - + +@Returns: - + +@major: +@minor: +@rc: +@pre: +@Returns: - + - + - + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-video-codec.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-video-codec.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-video-codec.sgml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-video-codec.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,582 @@ + +OGMRipVideoCodec + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@video: +@nframes: +@Returns: + + + + + + + +@video: + + + + + + + +@video: +@nonvideo_size: +@overhead_size: +@total_size: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@v4mv: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@angle: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@bitrate: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@bpp: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@cartoon: + + + + + + + +@video: +@x: +@y: +@width: +@height: +@Returns: + + + + + + + +@video: +@x: +@y: +@width: +@height: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@deblock: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@deint: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@denoise: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@dering: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@stream: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@grayscale: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@max_b_frames: + + + + + + + +@video: +@width: +@height: +@expand: +@Returns: + + + + + + + +@video: +@width: +@height: +@expand: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@pass: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@qpel: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@quality: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@quantizer: + + + + + + + +@video: +@width: +@height: + + + + + + + +@video: +@width: +@height: +@Returns: + + + + + + + +@video: +@width: +@height: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@scaler: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@threads: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@trellis: + + + + + + + +@video: +@Returns: + + + + + + + +@video: +@turbo: + + + + + + + +@video: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-video.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-video.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-video.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-video.sgml 1970-01-01 01:00:00.000000000 +0100 @@ -1,506 +0,0 @@ - -OGMRipVideo - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@video: -@nframes: -@Returns: - - - - - - - -@video: - - - - - - - -@video: -@nonvideo_size: -@overhead_size: -@total_size: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@v4mv: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@angle: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@bitrate: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@bpp: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@cartoon: - - - - - - - -@video: -@x: -@y: -@width: -@height: -@Returns: - - - - - - - -@video: -@x: -@y: -@width: -@height: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@deblock: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@deint: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@denoise: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@dering: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@stream: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@grayscale: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@log: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@max_b_frames: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@pass: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@pullup: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@qpel: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@quality: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@quantizer: - - - - - - - -@video: -@width: -@height: - - - - - - - -@video: -@width: -@height: -@Returns: - - - - - - - -@video: -@width: -@height: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@scaler: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@threads: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@trellis: - - - - - - - -@video: -@Returns: - - - - - - - -@video: -@turbo: - - diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-vobsub.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-vobsub.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-vobsub.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-vobsub.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -23,7 +23,6 @@ @parent_instance: -@priv: diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-vorbis.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-vorbis.sgml --- ogmrip-0.11.1/docs/reference/ogmrip/tmpl/ogmrip-vorbis.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/tmpl/ogmrip-vorbis.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -23,7 +23,6 @@ @parent_instance: -@priv: diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-aac.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-aac.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-aac.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-aac.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipAac +OGMRipAac 3 OGMRIP Library @@ -15,17 +15,13 @@ - + Synopsis - - - OGMRipAac; OGMJobSpawn* ogmrip_aac_new (OGMDvdAudioStream *audio, const gchar *output); - @@ -37,29 +33,27 @@ - + Description - + Details - -<anchor id="OGMRipAac" role="struct"/>OGMRipAac -OGMRipAactypedef struct { - OGMRipAudio parent_instance; - - OGMRipAacPriv *priv; + +OGMRipAac +OGMRipAactypedef struct { + OGMRipAudioCodec parent_instance; } OGMRipAac; - -<anchor id="ogmrip-aac-new" role="function"/>ogmrip_aac_new () -ogmrip_aac_newOGMJobSpawn* ogmrip_aac_new (OGMDvdAudioStream *audio, + +ogmrip_aac_new () +ogmrip_aac_newOGMJobSpawn* ogmrip_aac_new (OGMDvdAudioStream *audio, const gchar *output); Creates a new OGMRipAac. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-acopy.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-acopy.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-acopy.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-acopy.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipAudioCopy +OGMRipAudioCopy 3 OGMRIP Library @@ -15,17 +15,13 @@ - + Synopsis - - - OGMRipAudioCopy; OGMJobSpawn* ogmrip_audio_copy_new (OGMDvdAudioStream *audio, const gchar *output); - @@ -37,29 +33,27 @@ - + Description - + Details - -<anchor id="OGMRipAudioCopy" role="struct"/>OGMRipAudioCopy -OGMRipAudioCopytypedef struct { - OGMRipAudio parent_instance; - - OGMRipAudioCopyPriv *priv; + +OGMRipAudioCopy +OGMRipAudioCopytypedef struct { + OGMRipAudioCodec parent_instance; } OGMRipAudioCopy; - -<anchor id="ogmrip-audio-copy-new" role="function"/>ogmrip_audio_copy_new () -ogmrip_audio_copy_newOGMJobSpawn* ogmrip_audio_copy_new (OGMDvdAudioStream *audio, + +ogmrip_audio_copy_new () +ogmrip_audio_copy_newOGMJobSpawn* ogmrip_audio_copy_new (OGMDvdAudioStream *audio, const gchar *output); Creates a new OGMRipAudioCopy. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-audio-codec.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-audio-codec.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-audio-codec.xml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-audio-codec.xml 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,331 @@ + + + + + +OGMRipAudioCodec +3 +OGMRIP Library + + + +OGMRipAudioCodec +Base class for audio codecs + + + + +Synopsis + + + +#include <ogmrip-audio-codec.h> + + OGMRipAudioCodec; +OGMDvdAudioStream* ogmrip_audio_codec_get_dvd_audio_stream + (OGMRipAudioCodec *audio); +void ogmrip_audio_codec_set_dvd_audio_stream + (OGMRipAudioCodec *audio, + OGMDvdAudioStream *stream); +gint ogmrip_audio_codec_get_channels (OGMRipAudioCodec *audio); +void ogmrip_audio_codec_set_channels (OGMRipAudioCodec *audio, + OGMDvdAudioChannels channels); +gboolean ogmrip_audio_codec_get_fast (OGMRipAudioCodec *audio); +void ogmrip_audio_codec_set_fast (OGMRipAudioCodec *audio, + gboolean fast); +gboolean ogmrip_audio_codec_get_normalize (OGMRipAudioCodec *audio); +void ogmrip_audio_codec_set_normalize (OGMRipAudioCodec *audio, + gboolean normalize); +gint ogmrip_audio_codec_get_quality (OGMRipAudioCodec *audio); +void ogmrip_audio_codec_set_quality (OGMRipAudioCodec *audio, + guint quality); +gint ogmrip_audio_codec_get_sample_rate (OGMRipAudioCodec *audio); +void ogmrip_audio_codec_set_sample_rate (OGMRipAudioCodec *audio, + guint srate); +gint ogmrip_audio_codec_get_samples_per_frame + (OGMRipAudioCodec *audio); + + + + +Object Hierarchy + + GObject + +----OGMJobSpawn + +----OGMJobContainer + +----OGMJobBin + +----OGMRipCodec + +----OGMRipAudioCodec + + + + + + + + + +Properties + + "channels" guint : Read / Write + "fast" gboolean : Read / Write + "normalize" gboolean : Read / Write + "quality" guint : Read / Write + "samples-per-frame" guint : Read + "stream" gpointer : Read / Write + + + + + + +Description + + + + + + + + +Details + +OGMRipAudioCodec +OGMRipAudioCodectypedef struct _OGMRipAudioCodec OGMRipAudioCodec; + + + + +ogmrip_audio_codec_get_dvd_audio_stream () +ogmrip_audio_codec_get_dvd_audio_streamOGMDvdAudioStream* ogmrip_audio_codec_get_dvd_audio_stream + (OGMRipAudioCodec *audio); + +Gets the audio stream to encode. + + + +audio : + an OGMRipAudioCodec + +Returns : an OGMDvdAudioStream, or NULL + + + +ogmrip_audio_codec_set_dvd_audio_stream () +ogmrip_audio_codec_set_dvd_audio_streamvoid ogmrip_audio_codec_set_dvd_audio_stream + (OGMRipAudioCodec *audio, + OGMDvdAudioStream *stream); + +Sets the audio stream to encode. + + + +audio : + an OGMRipAudioCodec + +stream : + an OGMDvdAudioStream + + + +ogmrip_audio_codec_get_channels () +ogmrip_audio_codec_get_channelsgint ogmrip_audio_codec_get_channels (OGMRipAudioCodec *audio); + +Gets the number of channels of the output file. + + + +audio : + an OGMRipAudioCodec + +Returns : an OGMDvdAudioChannels, or -1 + + + +ogmrip_audio_codec_set_channels () +ogmrip_audio_codec_set_channelsvoid ogmrip_audio_codec_set_channels (OGMRipAudioCodec *audio, + OGMDvdAudioChannels channels); + +Sets the number of channels of the output file. + + + +audio : + an OGMRipAudioCodec + +channels : + an OGMDvdAudioChannels + + + +ogmrip_audio_codec_get_fast () +ogmrip_audio_codec_get_fastgboolean ogmrip_audio_codec_get_fast (OGMRipAudioCodec *audio); + +Returns whether to encode faster than realtime. + + + +audio : + an OGMRipAudioCodec + +Returns : TRUE if fast encoding is enabled + + + +ogmrip_audio_codec_set_fast () +ogmrip_audio_codec_set_fastvoid ogmrip_audio_codec_set_fast (OGMRipAudioCodec *audio, + gboolean fast); + +Sets whether to encode faster than realtime. + + + +audio : + an OGMRipAudioCodec + +fast : + TRUE to enable fast encoding + + + +ogmrip_audio_codec_get_normalize () +ogmrip_audio_codec_get_normalizegboolean ogmrip_audio_codec_get_normalize (OGMRipAudioCodec *audio); + +Returns whether the volume of the audio stream should be normalized. + + + +audio : + an OGMRipAudioCodec + +Returns : TRUE if normalization is enabled + + + +ogmrip_audio_codec_set_normalize () +ogmrip_audio_codec_set_normalizevoid ogmrip_audio_codec_set_normalize (OGMRipAudioCodec *audio, + gboolean normalize); + +Sets whether to normalize the volume of the audio stream. + + + +audio : + an OGMRipAudioCodec + +normalize : + TRUE to enable normalization + + + +ogmrip_audio_codec_get_quality () +ogmrip_audio_codec_get_qualitygint ogmrip_audio_codec_get_quality (OGMRipAudioCodec *audio); + +Gets the quality of the encoding, 0 for lowest, 10 for best. + + + +audio : + an OGMRipAudioCodec + +Returns : the quality, or -1 + + + +ogmrip_audio_codec_set_quality () +ogmrip_audio_codec_set_qualityvoid ogmrip_audio_codec_set_quality (OGMRipAudioCodec *audio, + guint quality); + +Sets the quality of the encoding, 0 for lowest, 10 for best. + + + +audio : + an OGMRipAudioCodec + +quality : + the quality of the encoding + + + +ogmrip_audio_codec_get_sample_rate () +ogmrip_audio_codec_get_sample_rategint ogmrip_audio_codec_get_sample_rate (OGMRipAudioCodec *audio); + +Gets the output sample rate. + + + +audio : + an OGMRipAudioCodec + +Returns : the sample rate + + + +ogmrip_audio_codec_set_sample_rate () +ogmrip_audio_codec_set_sample_ratevoid ogmrip_audio_codec_set_sample_rate (OGMRipAudioCodec *audio, + guint srate); + +Sets the output sample rate to be used. + + + +audio : + an OGMRipAudioCodec + +srate : + the sample rate + + + +ogmrip_audio_codec_get_samples_per_frame () +ogmrip_audio_codec_get_samples_per_framegint ogmrip_audio_codec_get_samples_per_frame + (OGMRipAudioCodec *audio); + +Gets the number of samples per frame. + + + +audio : + an OGMRipAudioCodec + +Returns : the number of samples per frame, or -1 + + + + + +Property Details +The <literal>"channels"</literal> property +OGMRipAudioCodec:channels "channels" guint : Read / Write +Set channels.Allowed values: <= 10 +Default value: 1 + +The <literal>"fast"</literal> property +OGMRipAudioCodec:fast "fast" gboolean : Read / Write +Set fast.Default value: FALSE + +The <literal>"normalize"</literal> property +OGMRipAudioCodec:normalize "normalize" gboolean : Read / Write +Set normalize.Default value: FALSE + +The <literal>"quality"</literal> property +OGMRipAudioCodec:quality "quality" guint : Read / Write +Set quality.Allowed values: <= 10 +Default value: 3 + +The <literal>"samples-per-frame"</literal> property +OGMRipAudioCodec:samples-per-frame "samples-per-frame" guint : Read +Set samples per frame.Default value: 512 + +The <literal>"stream"</literal> property +OGMRipAudioCodec:stream "stream" gpointer : Read / Write +Set audio stream. + + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-audio.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-audio.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-audio.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-audio.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,329 +0,0 @@ - - - - - -OGMRipAudio -3 -OGMRIP Library - - - -OGMRipAudio -Base class for audio codecs - - - - -Synopsis - - - -#include <ogmrip-audio.h> - - - OGMRipAudio; -OGMDvdAudioStream* ogmrip_audio_get_dvd_audio_stream (OGMRipAudio *audio); -void ogmrip_audio_set_dvd_audio_stream (OGMRipAudio *audio, - OGMDvdAudioStream *stream); -gint ogmrip_audio_get_channels (OGMRipAudio *audio); -void ogmrip_audio_set_channels (OGMRipAudio *audio, - OGMDvdAudioChannels channels); -gboolean ogmrip_audio_get_fast (OGMRipAudio *audio); -void ogmrip_audio_set_fast (OGMRipAudio *audio, - gboolean fast); -gboolean ogmrip_audio_get_normalize (OGMRipAudio *audio); -void ogmrip_audio_set_normalize (OGMRipAudio *audio, - gboolean normalize); -gint ogmrip_audio_get_quality (OGMRipAudio *audio); -void ogmrip_audio_set_quality (OGMRipAudio *audio, - guint quality); -gint ogmrip_audio_get_sample_rate (OGMRipAudio *audio); -void ogmrip_audio_set_sample_rate (OGMRipAudio *audio, - guint srate); -gint ogmrip_audio_get_samples_per_frame (OGMRipAudio *audio); - - - - - -Object Hierarchy - - - GObject - +----OGMJobSpawn - +----OGMJobContainer - +----OGMJobBin - +----OGMRipCodec - +----OGMRipAudio - - - - - - - - - -Properties - - - "channels" guint : Read / Write - "fast" gboolean : Read / Write - "normalize" gboolean : Read / Write - "quality" guint : Read / Write - "samples-per-frame" guint : Read - "stream" gpointer : Read / Write - - - - - - -Description - - - - - - - - -Details - -<anchor id="OGMRipAudio-struct" role="struct"/>OGMRipAudio -OGMRipAudiotypedef struct _OGMRipAudio OGMRipAudio; - - - - -<anchor id="ogmrip-audio-get-dvd-audio-stream" role="function"/>ogmrip_audio_get_dvd_audio_stream () -ogmrip_audio_get_dvd_audio_streamOGMDvdAudioStream* ogmrip_audio_get_dvd_audio_stream (OGMRipAudio *audio); - -Gets the audio stream to encode. - - - -audio : - an OGMRipAudio - -Returns : an OGMDvdAudioStream, or NULL - - - -<anchor id="ogmrip-audio-set-dvd-audio-stream" role="function"/>ogmrip_audio_set_dvd_audio_stream () -ogmrip_audio_set_dvd_audio_streamvoid ogmrip_audio_set_dvd_audio_stream (OGMRipAudio *audio, - OGMDvdAudioStream *stream); - -Sets the audio stream to encode. - - - -audio : - an OGMRipAudio - -stream : - an OGMDvdAudioStream - - - -<anchor id="ogmrip-audio-get-channels" role="function"/>ogmrip_audio_get_channels () -ogmrip_audio_get_channelsgint ogmrip_audio_get_channels (OGMRipAudio *audio); - -Gets the number of channels of the output file. - - - -audio : - an OGMRipAudio - -Returns : an OGMDvdAudioChannels, or -1 - - - -<anchor id="ogmrip-audio-set-channels" role="function"/>ogmrip_audio_set_channels () -ogmrip_audio_set_channelsvoid ogmrip_audio_set_channels (OGMRipAudio *audio, - OGMDvdAudioChannels channels); - -Sets the number of channels of the output file. - - - -audio : - an OGMRipAudio - -channels : - an OGMDvdAudioChannels - - - -<anchor id="ogmrip-audio-get-fast" role="function"/>ogmrip_audio_get_fast () -ogmrip_audio_get_fastgboolean ogmrip_audio_get_fast (OGMRipAudio *audio); - -Returns whether to encode faster than realtime. - - - -audio : - an OGMRipAudio - -Returns : TRUE if fast encoding is enabled - - - -<anchor id="ogmrip-audio-set-fast" role="function"/>ogmrip_audio_set_fast () -ogmrip_audio_set_fastvoid ogmrip_audio_set_fast (OGMRipAudio *audio, - gboolean fast); - -Sets whether to encode faster than realtime. - - - -audio : - an OGMRipAudio - -fast : - TRUE to enable fast encoding - - - -<anchor id="ogmrip-audio-get-normalize" role="function"/>ogmrip_audio_get_normalize () -ogmrip_audio_get_normalizegboolean ogmrip_audio_get_normalize (OGMRipAudio *audio); - -Returns whether the volume of the audio stream should be normalized. - - - -audio : - an OGMRipAudio - -Returns : TRUE if normalization is enabled - - - -<anchor id="ogmrip-audio-set-normalize" role="function"/>ogmrip_audio_set_normalize () -ogmrip_audio_set_normalizevoid ogmrip_audio_set_normalize (OGMRipAudio *audio, - gboolean normalize); - -Sets whether to normalize the volume of the audio stream. - - - -audio : - an OGMRipAudio - -normalize : - TRUE to enable normalization - - - -<anchor id="ogmrip-audio-get-quality" role="function"/>ogmrip_audio_get_quality () -ogmrip_audio_get_qualitygint ogmrip_audio_get_quality (OGMRipAudio *audio); - -Gets the quality of the encoding, 0 for lowest, 10 for best. - - - -audio : - an OGMRipAudio - -Returns : the quality, or -1 - - - -<anchor id="ogmrip-audio-set-quality" role="function"/>ogmrip_audio_set_quality () -ogmrip_audio_set_qualityvoid ogmrip_audio_set_quality (OGMRipAudio *audio, - guint quality); - -Sets the quality of the encoding, 0 for lowest, 10 for best. - - - -audio : - an OGMRipAudio - -quality : - the quality of the encoding - - - -<anchor id="ogmrip-audio-get-sample-rate" role="function"/>ogmrip_audio_get_sample_rate () -ogmrip_audio_get_sample_rategint ogmrip_audio_get_sample_rate (OGMRipAudio *audio); - -Gets the output sample rate. - - - -audio : - an OGMRipAudio - -Returns : the sample rate - - - -<anchor id="ogmrip-audio-set-sample-rate" role="function"/>ogmrip_audio_set_sample_rate () -ogmrip_audio_set_sample_ratevoid ogmrip_audio_set_sample_rate (OGMRipAudio *audio, - guint srate); - -Sets the output sample rate to be used. - - - -audio : - an OGMRipAudio - -srate : - the sample rate - - - -<anchor id="ogmrip-audio-get-samples-per-frame" role="function"/>ogmrip_audio_get_samples_per_frame () -ogmrip_audio_get_samples_per_framegint ogmrip_audio_get_samples_per_frame (OGMRipAudio *audio); - -Gets the number of samples per frame. - - - -audio : - an OGMRipAudio - -Returns : the number of samples per frame, or -1 - - - - - -Property Details -<anchor id="OGMRipAudio--channels"/>The "<literal>channels</literal>" property -OGMRipAudio:channels "channels" guint : Read / Write -Set channels.Allowed values: <= 10 -Default value: 1 - -<anchor id="OGMRipAudio--fast"/>The "<literal>fast</literal>" property -OGMRipAudio:fast "fast" gboolean : Read / Write -Set fast.Default value: FALSE - -<anchor id="OGMRipAudio--normalize"/>The "<literal>normalize</literal>" property -OGMRipAudio:normalize "normalize" gboolean : Read / Write -Set normalize.Default value: FALSE - -<anchor id="OGMRipAudio--quality"/>The "<literal>quality</literal>" property -OGMRipAudio:quality "quality" guint : Read / Write -Set quality.Allowed values: <= 10 -Default value: 3 - -<anchor id="OGMRipAudio--samples-per-frame"/>The "<literal>samples-per-frame</literal>" property -OGMRipAudio:samples-per-frame "samples-per-frame" guint : Read -Set samples per frame.Default value: 512 - -<anchor id="OGMRipAudio--stream"/>The "<literal>stream</literal>" property -OGMRipAudio:stream "stream" gpointer : Read / Write -Set audio stream. - - - - - - - diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-avi.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-avi.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-avi.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-avi.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipAvi +OGMRipAvi 3 OGMRIP Library @@ -15,16 +15,12 @@ - + Synopsis - - - OGMRipAvi; OGMJobSpawn* ogmrip_avi_new (const gchar *output); - @@ -36,29 +32,27 @@ - + Description - + Details - -<anchor id="OGMRipAvi" role="struct"/>OGMRipAvi -OGMRipAvitypedef struct { + +OGMRipAvi +OGMRipAvitypedef struct { OGMRipContainer parent_instance; - - OGMRipAviPriv *priv; } OGMRipAvi; - -<anchor id="ogmrip-avi-new" role="function"/>ogmrip_avi_new () -ogmrip_avi_newOGMJobSpawn* ogmrip_avi_new (const gchar *output); + +ogmrip_avi_new () +ogmrip_avi_newOGMJobSpawn* ogmrip_avi_new (const gchar *output); Creates a new OGMRipAvi. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-chapters.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-chapters.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-chapters.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-chapters.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipChapters +OGMRipChapters 3 OGMRIP Library @@ -15,14 +15,13 @@ - + Synopsis #include <ogmrip-chapters.h> - OGMRipChapters; OGMJobSpawn* ogmrip_chapters_new (OGMDvdTitle *title, const gchar *output); @@ -31,14 +30,12 @@ void ogmrip_chapters_set_label (OGMRipChapters *chapters, guint n, const gchar *label); - - + Object Hierarchy - GObject +----OGMJobSpawn +----OGMJobContainer @@ -56,7 +53,7 @@ - + Description @@ -65,17 +62,17 @@ - + Details - -<anchor id="OGMRipChapters-struct" role="struct"/>OGMRipChapters -OGMRipChapterstypedef struct _OGMRipChapters OGMRipChapters; + +OGMRipChapters +OGMRipChapterstypedef struct _OGMRipChapters OGMRipChapters; - -<anchor id="ogmrip-chapters-new" role="function"/>ogmrip_chapters_new () -ogmrip_chapters_newOGMJobSpawn* ogmrip_chapters_new (OGMDvdTitle *title, + +ogmrip_chapters_new () +ogmrip_chapters_newOGMJobSpawn* ogmrip_chapters_new (OGMDvdTitle *title, const gchar *output); Creates a new OGMRipChapters. @@ -91,9 +88,9 @@ Returns : The new OGMRipChapters - -<anchor id="ogmrip-chapters-get-label" role="function"/>ogmrip_chapters_get_label () -ogmrip_chapters_get_labelgchar* ogmrip_chapters_get_label (OGMRipChapters *chapters, + +ogmrip_chapters_get_label () +ogmrip_chapters_get_labelgchar* ogmrip_chapters_get_label (OGMRipChapters *chapters, guint n); Returns the label of this chapter. @@ -109,9 +106,9 @@ Returns : The label - -<anchor id="ogmrip-chapters-set-label" role="function"/>ogmrip_chapters_set_label () -ogmrip_chapters_set_labelvoid ogmrip_chapters_set_label (OGMRipChapters *chapters, + +ogmrip_chapters_set_label () +ogmrip_chapters_set_labelvoid ogmrip_chapters_set_label (OGMRipChapters *chapters, guint n, const gchar *label); diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-codec.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-codec.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-codec.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-codec.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipCodec +OGMRipCodec 3 OGMRIP Library @@ -15,14 +15,13 @@ - + Synopsis #include <ogmrip-codec.h> - OGMRipCodec; gchar* ogmrip_codec_get_output (OGMRipCodec *codec); void ogmrip_codec_set_output (OGMRipCodec *codec, @@ -32,6 +31,13 @@ OGMDvdTitle *title); gdouble ogmrip_codec_get_length (OGMRipCodec *codec, OGMDvdTime *length); +glong ogmrip_codec_get_frames (OGMRipCodec *codec); +gboolean ogmrip_codec_get_telecine (OGMRipCodec *codec); +void ogmrip_codec_set_telecine (OGMRipCodec *codec, + gboolean telecine); +gboolean ogmrip_codec_get_progressive (OGMRipCodec *codec); +void ogmrip_codec_set_progressive (OGMRipCodec *codec, + gboolean progressive); void ogmrip_codec_set_edl (OGMRipCodec *codec, OGMRipEdl *edl); OGMRipEdl* ogmrip_codec_get_edl (OGMRipCodec *codec); @@ -53,24 +59,22 @@ void ogmrip_codec_set_unlink_on_unref (OGMRipCodec *codec, gboolean do_unlink); gboolean ogmrip_codec_get_unlink_on_unref (OGMRipCodec *codec); - - + Object Hierarchy - GObject +----OGMJobSpawn +----OGMJobContainer +----OGMJobBin +----OGMRipCodec - +----OGMRipAudio + +----OGMRipAudioCodec +----OGMRipChapters +----OGMRipDvdCpy - +----OGMRipSubp - +----OGMRipVideo + +----OGMRipSubpCodec + +----OGMRipVideoCodec @@ -79,15 +83,14 @@ - + Properties - "end-chapter" gint : Read / Write "framestep" guint : Read / Write "input" gpointer : Read / Write "length" gdouble : Read - "output" gchararray : Read / Write + "output" gchar* : Read / Write "progressive" gboolean : Read / Write "start-chapter" gint : Read / Write "telecine" gboolean : Read / Write @@ -96,7 +99,7 @@ - + Description @@ -105,17 +108,17 @@ - + Details - -<anchor id="OGMRipCodec-struct" role="struct"/>OGMRipCodec -OGMRipCodectypedef struct _OGMRipCodec OGMRipCodec; + +OGMRipCodec +OGMRipCodectypedef struct _OGMRipCodec OGMRipCodec; - -<anchor id="ogmrip-codec-get-output" role="function"/>ogmrip_codec_get_output () -ogmrip_codec_get_outputgchar* ogmrip_codec_get_output (OGMRipCodec *codec); + +ogmrip_codec_get_output () +ogmrip_codec_get_outputgchar* ogmrip_codec_get_output (OGMRipCodec *codec); Gets the name of the output file. @@ -127,9 +130,9 @@ Returns : the filename, or NULL - -<anchor id="ogmrip-codec-set-output" role="function"/>ogmrip_codec_set_output () -ogmrip_codec_set_outputvoid ogmrip_codec_set_output (OGMRipCodec *codec, + +ogmrip_codec_set_output () +ogmrip_codec_set_outputvoid ogmrip_codec_set_output (OGMRipCodec *codec, const gchar *output); Sets the name of the output file. @@ -143,9 +146,9 @@ the name of the output file - -<anchor id="ogmrip-codec-get-input" role="function"/>ogmrip_codec_get_input () -ogmrip_codec_get_inputOGMDvdTitle* ogmrip_codec_get_input (OGMRipCodec *codec); + +ogmrip_codec_get_input () +ogmrip_codec_get_inputOGMDvdTitle* ogmrip_codec_get_input (OGMRipCodec *codec); Gets the input DVD title. @@ -157,9 +160,9 @@ Returns : an OGMDvdTitle, or NULL - -<anchor id="ogmrip-codec-set-input" role="function"/>ogmrip_codec_set_input () -ogmrip_codec_set_inputvoid ogmrip_codec_set_input (OGMRipCodec *codec, + +ogmrip_codec_set_input () +ogmrip_codec_set_inputvoid ogmrip_codec_set_input (OGMRipCodec *codec, OGMDvdTitle *title); Sets the input DVD title. @@ -173,9 +176,9 @@ an OGMDvdTitle - -<anchor id="ogmrip-codec-get-length" role="function"/>ogmrip_codec_get_length () -ogmrip_codec_get_lengthgdouble ogmrip_codec_get_length (OGMRipCodec *codec, + +ogmrip_codec_get_length () +ogmrip_codec_get_lengthgdouble ogmrip_codec_get_length (OGMRipCodec *codec, OGMDvdTime *length); Returns the length of the encoding in seconds. If length is not NULL, the @@ -193,9 +196,83 @@ Returns : the length in seconds, or -1.0 - -<anchor id="ogmrip-codec-set-edl" role="function"/>ogmrip_codec_set_edl () -ogmrip_codec_set_edlvoid ogmrip_codec_set_edl (OGMRipCodec *codec, + +ogmrip_codec_get_frames () +ogmrip_codec_get_framesglong ogmrip_codec_get_frames (OGMRipCodec *codec); + +Returns the length of the encoding in frames. + + + +codec : + an OGMRipCodec + +Returns : the length in frames, or -1 + + + +ogmrip_codec_get_telecine () +ogmrip_codec_get_telecinegboolean ogmrip_codec_get_telecine (OGMRipCodec *codec); + +Gets whether an inverse telecine filter will be applied + + + +codec : + an OGMRipCodec + +Returns : TRUE if inverse telecine + + + +ogmrip_codec_set_telecine () +ogmrip_codec_set_telecinevoid ogmrip_codec_set_telecine (OGMRipCodec *codec, + gboolean telecine); + +Sets whether an inverse telecine filter will be applied + + + +codec : + an OGMRipCodec + +telecine : + TRUE to inverse telecine + + + +ogmrip_codec_get_progressive () +ogmrip_codec_get_progressivegboolean ogmrip_codec_get_progressive (OGMRipCodec *codec); + +Gets whether an inverse progressive filter will be applied + + + +codec : + an OGMRipCodec + +Returns : TRUE if inverse progressive + + + +ogmrip_codec_set_progressive () +ogmrip_codec_set_progressivevoid ogmrip_codec_set_progressive (OGMRipCodec *codec, + gboolean progressive); + +Sets whether an inverse progressive filter will be applied + + + +codec : + an OGMRipCodec + +progressive : + TRUE to inverse progressive + + + +ogmrip_codec_set_edl () +ogmrip_codec_set_edlvoid ogmrip_codec_set_edl (OGMRipCodec *codec, OGMRipEdl *edl); Sets an edit decision list file. @@ -209,9 +286,9 @@ an OGMRipEdl - -<anchor id="ogmrip-codec-get-edl" role="function"/>ogmrip_codec_get_edl () -ogmrip_codec_get_edlOGMRipEdl* ogmrip_codec_get_edl (OGMRipCodec *codec); + +ogmrip_codec_get_edl () +ogmrip_codec_get_edlOGMRipEdl* ogmrip_codec_get_edl (OGMRipCodec *codec); Gets the edit decision list if any. @@ -223,9 +300,9 @@ Returns : an OGMRipEdl, or NULL - -<anchor id="ogmrip-codec-set-chapters" role="function"/>ogmrip_codec_set_chapters () -ogmrip_codec_set_chaptersvoid ogmrip_codec_set_chapters (OGMRipCodec *codec, + +ogmrip_codec_set_chapters () +ogmrip_codec_set_chaptersvoid ogmrip_codec_set_chapters (OGMRipCodec *codec, guint start, gint end); @@ -243,9 +320,9 @@ the end chapter - -<anchor id="ogmrip-codec-get-chapters" role="function"/>ogmrip_codec_get_chapters () -ogmrip_codec_get_chaptersvoid ogmrip_codec_get_chapters (OGMRipCodec *codec, + +ogmrip_codec_get_chapters () +ogmrip_codec_get_chaptersvoid ogmrip_codec_get_chapters (OGMRipCodec *codec, guint *start, guint *end); @@ -263,9 +340,9 @@ a pointer to set the end chapter - -<anchor id="ogmrip-codec-set-framerate" role="function"/>ogmrip_codec_set_framerate () -ogmrip_codec_set_frameratevoid ogmrip_codec_set_framerate (OGMRipCodec *codec, + +ogmrip_codec_set_framerate () +ogmrip_codec_set_frameratevoid ogmrip_codec_set_framerate (OGMRipCodec *codec, guint numerator, guint denominator); @@ -284,9 +361,9 @@ the framerate denominator - -<anchor id="ogmrip-codec-get-framerate" role="function"/>ogmrip_codec_get_framerate () -ogmrip_codec_get_frameratevoid ogmrip_codec_get_framerate (OGMRipCodec *codec, + +ogmrip_codec_get_framerate () +ogmrip_codec_get_frameratevoid ogmrip_codec_get_framerate (OGMRipCodec *codec, guint *numerator, guint *denominator); @@ -304,9 +381,9 @@ a pointer to store the framerate denominator - -<anchor id="ogmrip-codec-set-framestep" role="function"/>ogmrip_codec_set_framestep () -ogmrip_codec_set_framestepvoid ogmrip_codec_set_framestep (OGMRipCodec *codec, + +ogmrip_codec_set_framestep () +ogmrip_codec_set_framestepvoid ogmrip_codec_set_framestep (OGMRipCodec *codec, guint framestep); Skips framestep frames after every frame. @@ -320,9 +397,9 @@ the framestep - -<anchor id="ogmrip-codec-get-framestep" role="function"/>ogmrip_codec_get_framestep () -ogmrip_codec_get_framestepgint ogmrip_codec_get_framestep (OGMRipCodec *codec); + +ogmrip_codec_get_framestep () +ogmrip_codec_get_framestepgint ogmrip_codec_get_framestep (OGMRipCodec *codec); Gets the number of frames to skip after every frame. @@ -334,9 +411,9 @@ Returns : the framestep, or -1 - -<anchor id="ogmrip-codec-set-unlink-on-unref" role="function"/>ogmrip_codec_set_unlink_on_unref () -ogmrip_codec_set_unlink_on_unrefvoid ogmrip_codec_set_unlink_on_unref (OGMRipCodec *codec, + +ogmrip_codec_set_unlink_on_unref () +ogmrip_codec_set_unlink_on_unrefvoid ogmrip_codec_set_unlink_on_unref (OGMRipCodec *codec, gboolean do_unlink); Whether to unlink the output file on the final unref of the OGMRipCodec @@ -351,9 +428,9 @@ TRUE to unlink the output file - -<anchor id="ogmrip-codec-get-unlink-on-unref" role="function"/>ogmrip_codec_get_unlink_on_unref () -ogmrip_codec_get_unlink_on_unrefgboolean ogmrip_codec_get_unlink_on_unref (OGMRipCodec *codec); + +ogmrip_codec_get_unlink_on_unref () +ogmrip_codec_get_unlink_on_unrefgboolean ogmrip_codec_get_unlink_on_unref (OGMRipCodec *codec); Returns whether the output file will be unlinked on the final unref of codec. @@ -368,40 +445,40 @@ - + Property Details -<anchor id="OGMRipCodec--end-chapter"/>The "<literal>end-chapter</literal>" property -OGMRipCodec:end-chapter "end-chapter" gint : Read / Write +The <literal>"end-chapter"</literal> property +OGMRipCodec:end-chapter "end-chapter" gint : Read / Write Set end chapter.Allowed values: >= -1 Default value: -1 -<anchor id="OGMRipCodec--framestep"/>The "<literal>framestep</literal>" property -OGMRipCodec:framestep "framestep" guint : Read / Write +The <literal>"framestep"</literal> property +OGMRipCodec:framestep "framestep" guint : Read / Write Set framestep.Default value: 1 -<anchor id="OGMRipCodec--input"/>The "<literal>input</literal>" property -OGMRipCodec:input "input" gpointer : Read / Write +The <literal>"input"</literal> property +OGMRipCodec:input "input" gpointer : Read / Write Set input title. -<anchor id="OGMRipCodec--length"/>The "<literal>length</literal>" property -OGMRipCodec:length "length" gdouble : Read +The <literal>"length"</literal> property +OGMRipCodec:length "length" gdouble : Read Get length.Allowed values: >= 0 Default value: 0 -<anchor id="OGMRipCodec--output"/>The "<literal>output</literal>" property -OGMRipCodec:output "output" gchararray : Read / Write +The <literal>"output"</literal> property +OGMRipCodec:output "output" gchar* : Read / Write Set output file.Default value: NULL -<anchor id="OGMRipCodec--progressive"/>The "<literal>progressive</literal>" property -OGMRipCodec:progressive "progressive" gboolean : Read / Write +The <literal>"progressive"</literal> property +OGMRipCodec:progressive "progressive" gboolean : Read / Write Set progressive.Default value: FALSE -<anchor id="OGMRipCodec--start-chapter"/>The "<literal>start-chapter</literal>" property -OGMRipCodec:start-chapter "start-chapter" gint : Read / Write +The <literal>"start-chapter"</literal> property +OGMRipCodec:start-chapter "start-chapter" gint : Read / Write Set start chapter.Allowed values: >= 0 Default value: 0 -<anchor id="OGMRipCodec--telecine"/>The "<literal>telecine</literal>" property -OGMRipCodec:telecine "telecine" gboolean : Read / Write +The <literal>"telecine"</literal> property +OGMRipCodec:telecine "telecine" gboolean : Read / Write Set telecine.Default value: FALSE diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-container.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-container.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-container.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-container.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipContainer +OGMRipContainer 3 OGMRIP Library @@ -15,14 +15,13 @@ - + Synopsis #include <ogmrip-container.h> - void (*OGMRipContainerCodecFunc) (OGMRipContainer *container, OGMRipCodec *codec, guint demuxer, @@ -41,27 +40,27 @@ gchar* ogmrip_container_get_fourcc (OGMRipContainer *container); void ogmrip_container_set_fourcc (OGMRipContainer *container, const gchar *fourcc); -OGMRipVideo* ogmrip_container_get_video (OGMRipContainer *container); +OGMRipVideoCodec* ogmrip_container_get_video (OGMRipContainer *container); void ogmrip_container_set_video (OGMRipContainer *container, - OGMRipVideo *video); + OGMRipVideoCodec *video); void ogmrip_container_add_audio (OGMRipContainer *container, - OGMRipAudio *audio, + OGMRipAudioCodec *audio, OGMRipAudioDemuxer demuxer, gint language); GSList* ogmrip_container_get_audio (OGMRipContainer *container); -OGMRipAudio* ogmrip_container_get_nth_audio (OGMRipContainer *container, +OGMRipAudioCodec* ogmrip_container_get_nth_audio (OGMRipContainer *container, gint n); gint ogmrip_container_get_n_audio (OGMRipContainer *container); void ogmrip_container_foreach_audio (OGMRipContainer *container, OGMRipContainerCodecFunc func, gpointer data); void ogmrip_container_add_subp (OGMRipContainer *container, - OGMRipSubp *subp, + OGMRipSubpCodec *subp, OGMRipSubpDemuxer demuxer, gint language); GSList* ogmrip_container_get_subp (OGMRipContainer *container); gint ogmrip_container_get_n_subp (OGMRipContainer *container); -OGMRipSubp* ogmrip_container_get_nth_subp (OGMRipContainer *container, +OGMRipSubpCodec* ogmrip_container_get_nth_subp (OGMRipContainer *container, gint n); void ogmrip_container_foreach_subp (OGMRipContainer *container, OGMRipContainerCodecFunc func, @@ -91,16 +90,18 @@ void ogmrip_container_get_split (OGMRipContainer *container, guint *number, guint *size); +gint ogmrip_container_get_start_delay (OGMRipContainer *container); +void ogmrip_container_set_start_delay (OGMRipContainer *container, + guint start_delay); +gint ogmrip_container_get_overhead (OGMRipContainer *container); gint64 ogmrip_container_get_overhead_size (OGMRipContainer *container); gint64 ogmrip_container_get_nonvideo_size (OGMRipContainer *container); - - + Object Hierarchy - GObject +----OGMJobSpawn +----OGMJobContainer @@ -114,13 +115,12 @@ - + Properties - - "fourcc" gchararray : Read / Write - "label" gchararray : Read / Write - "output" gchararray : Read / Write + "fourcc" gchar* : Read / Write + "label" gchar* : Read / Write + "output" gchar* : Read / Write "overhead" guint : Read "start-delay" guint : Read / Write "target-number" guint : Read / Write @@ -130,7 +130,7 @@ - + Description @@ -139,11 +139,11 @@ - + Details - -<anchor id="OGMRipContainerCodecFunc" role="function"/>OGMRipContainerCodecFunc () -OGMRipContainerCodecFuncvoid (*OGMRipContainerCodecFunc) (OGMRipContainer *container, + +OGMRipContainerCodecFunc () +OGMRipContainerCodecFuncvoid (*OGMRipContainerCodecFunc) (OGMRipContainer *container, OGMRipCodec *codec, guint demuxer, gint language, @@ -170,9 +170,9 @@ The user data - -<anchor id="OGMRipContainerFileFunc" role="function"/>OGMRipContainerFileFunc () -OGMRipContainerFileFuncvoid (*OGMRipContainerFileFunc) (OGMRipContainer *container, + +OGMRipContainerFileFunc () +OGMRipContainerFileFuncvoid (*OGMRipContainerFileFunc) (OGMRipContainer *container, OGMRipFile *file, gpointer user_data); @@ -190,15 +190,15 @@ The user data - -<anchor id="OGMRipContainer-struct" role="struct"/>OGMRipContainer -OGMRipContainertypedef struct _OGMRipContainer OGMRipContainer; + +OGMRipContainer +OGMRipContainertypedef struct _OGMRipContainer OGMRipContainer; - -<anchor id="ogmrip-container-get-output" role="function"/>ogmrip_container_get_output () -ogmrip_container_get_outputgchar* ogmrip_container_get_output (OGMRipContainer *container); + +ogmrip_container_get_output () +ogmrip_container_get_outputgchar* ogmrip_container_get_output (OGMRipContainer *container); Gets the name of the output file. @@ -210,9 +210,9 @@ Returns : The filename, or NULL - -<anchor id="ogmrip-container-set-output" role="function"/>ogmrip_container_set_output () -ogmrip_container_set_outputvoid ogmrip_container_set_output (OGMRipContainer *container, + +ogmrip_container_set_output () +ogmrip_container_set_outputvoid ogmrip_container_set_output (OGMRipContainer *container, const gchar *output); Sets the name of the output file. @@ -226,9 +226,9 @@ the name of the output file - -<anchor id="ogmrip-container-get-label" role="function"/>ogmrip_container_get_label () -ogmrip_container_get_labelgchar* ogmrip_container_get_label (OGMRipContainer *container); + +ogmrip_container_get_label () +ogmrip_container_get_labelgchar* ogmrip_container_get_label (OGMRipContainer *container); Gets the label of the rip. @@ -240,9 +240,9 @@ Returns : The label, or NULL - -<anchor id="ogmrip-container-set-label" role="function"/>ogmrip_container_set_label () -ogmrip_container_set_labelvoid ogmrip_container_set_label (OGMRipContainer *container, + +ogmrip_container_set_label () +ogmrip_container_set_labelvoid ogmrip_container_set_label (OGMRipContainer *container, const gchar *label); Sets the label of the rip. @@ -256,9 +256,9 @@ the label - -<anchor id="ogmrip-container-get-fourcc" role="function"/>ogmrip_container_get_fourcc () -ogmrip_container_get_fourccgchar* ogmrip_container_get_fourcc (OGMRipContainer *container); + +ogmrip_container_get_fourcc () +ogmrip_container_get_fourccgchar* ogmrip_container_get_fourcc (OGMRipContainer *container); Gets the FourCC of the rip. @@ -270,9 +270,9 @@ Returns : The FourCC, or NULL - -<anchor id="ogmrip-container-set-fourcc" role="function"/>ogmrip_container_set_fourcc () -ogmrip_container_set_fourccvoid ogmrip_container_set_fourcc (OGMRipContainer *container, + +ogmrip_container_set_fourcc () +ogmrip_container_set_fourccvoid ogmrip_container_set_fourcc (OGMRipContainer *container, const gchar *fourcc); Sets the FourCC of the rip. @@ -286,9 +286,9 @@ the FourCC - -<anchor id="ogmrip-container-get-video" role="function"/>ogmrip_container_get_video () -ogmrip_container_get_videoOGMRipVideo* ogmrip_container_get_video (OGMRipContainer *container); + +ogmrip_container_get_video () +ogmrip_container_get_videoOGMRipVideoCodec* ogmrip_container_get_video (OGMRipContainer *container); Gets the video codec of the rip. @@ -297,13 +297,13 @@ container : An OGMRipContainer -Returns : An OGMRipVideo, or NULL +Returns : An OGMRipVideoCodec, or NULL - -<anchor id="ogmrip-container-set-video" role="function"/>ogmrip_container_set_video () -ogmrip_container_set_videovoid ogmrip_container_set_video (OGMRipContainer *container, - OGMRipVideo *video); + +ogmrip_container_set_video () +ogmrip_container_set_videovoid ogmrip_container_set_video (OGMRipContainer *container, + OGMRipVideoCodec *video); Sets the video codec of the rip. @@ -313,13 +313,13 @@ An OGMRipContainer video : - An OGMRipVideo + An OGMRipVideoCodec - -<anchor id="ogmrip-container-add-audio" role="function"/>ogmrip_container_add_audio () -ogmrip_container_add_audiovoid ogmrip_container_add_audio (OGMRipContainer *container, - OGMRipAudio *audio, + +ogmrip_container_add_audio () +ogmrip_container_add_audiovoid ogmrip_container_add_audio (OGMRipContainer *container, + OGMRipAudioCodec *audio, OGMRipAudioDemuxer demuxer, gint language); @@ -331,7 +331,7 @@ An OGMRipContainer audio : - An OGMRipAudio + An OGMRipAudioCodec demuxer : The demuxer to be used @@ -340,9 +340,9 @@ The language of the stream - -<anchor id="ogmrip-container-get-audio" role="function"/>ogmrip_container_get_audio () -ogmrip_container_get_audioGSList* ogmrip_container_get_audio (OGMRipContainer *container); + +ogmrip_container_get_audio () +ogmrip_container_get_audioGSList* ogmrip_container_get_audio (OGMRipContainer *container); Gets a list of the audio codecs of the rip. @@ -354,9 +354,9 @@ Returns : A GSList, or NULL - -<anchor id="ogmrip-container-get-nth-audio" role="function"/>ogmrip_container_get_nth_audio () -ogmrip_container_get_nth_audioOGMRipAudio* ogmrip_container_get_nth_audio (OGMRipContainer *container, + +ogmrip_container_get_nth_audio () +ogmrip_container_get_nth_audioOGMRipAudioCodec* ogmrip_container_get_nth_audio (OGMRipContainer *container, gint n); Gets the audio codec at the given position. @@ -369,12 +369,12 @@ n : The index of the audio codec -Returns : An OGMRipAudio, or NULL +Returns : An OGMRipAudioCodec, or NULL - -<anchor id="ogmrip-container-get-n-audio" role="function"/>ogmrip_container_get_n_audio () -ogmrip_container_get_n_audiogint ogmrip_container_get_n_audio (OGMRipContainer *container); + +ogmrip_container_get_n_audio () +ogmrip_container_get_n_audiogint ogmrip_container_get_n_audio (OGMRipContainer *container); Gets the number of audio codecs. @@ -386,9 +386,9 @@ Returns : the number of audio codecs - -<anchor id="ogmrip-container-foreach-audio" role="function"/>ogmrip_container_foreach_audio () -ogmrip_container_foreach_audiovoid ogmrip_container_foreach_audio (OGMRipContainer *container, + +ogmrip_container_foreach_audio () +ogmrip_container_foreach_audiovoid ogmrip_container_foreach_audio (OGMRipContainer *container, OGMRipContainerCodecFunc func, gpointer data); @@ -406,10 +406,10 @@ User data to pass to the function - -<anchor id="ogmrip-container-add-subp" role="function"/>ogmrip_container_add_subp () -ogmrip_container_add_subpvoid ogmrip_container_add_subp (OGMRipContainer *container, - OGMRipSubp *subp, + +ogmrip_container_add_subp () +ogmrip_container_add_subpvoid ogmrip_container_add_subp (OGMRipContainer *container, + OGMRipSubpCodec *subp, OGMRipSubpDemuxer demuxer, gint language); @@ -421,7 +421,7 @@ An OGMRipContainer subp : - An OGMRipSubp + An OGMRipSubpCodec demuxer : The demuxer to be used @@ -430,9 +430,9 @@ The language of the stream - -<anchor id="ogmrip-container-get-subp" role="function"/>ogmrip_container_get_subp () -ogmrip_container_get_subpGSList* ogmrip_container_get_subp (OGMRipContainer *container); + +ogmrip_container_get_subp () +ogmrip_container_get_subpGSList* ogmrip_container_get_subp (OGMRipContainer *container); Gets a list of the subtitle codecs of the rip. @@ -444,9 +444,9 @@ Returns : A GSList, or NULL - -<anchor id="ogmrip-container-get-n-subp" role="function"/>ogmrip_container_get_n_subp () -ogmrip_container_get_n_subpgint ogmrip_container_get_n_subp (OGMRipContainer *container); + +ogmrip_container_get_n_subp () +ogmrip_container_get_n_subpgint ogmrip_container_get_n_subp (OGMRipContainer *container); Gets the number of subtitle codecs. @@ -458,9 +458,9 @@ Returns : the number of subtitle codecs - -<anchor id="ogmrip-container-get-nth-subp" role="function"/>ogmrip_container_get_nth_subp () -ogmrip_container_get_nth_subpOGMRipSubp* ogmrip_container_get_nth_subp (OGMRipContainer *container, + +ogmrip_container_get_nth_subp () +ogmrip_container_get_nth_subpOGMRipSubpCodec* ogmrip_container_get_nth_subp (OGMRipContainer *container, gint n); Gets the subtitle codec at the given position. @@ -473,12 +473,12 @@ n : The index of the subtitle codec -Returns : An OGMRipSubp, or NULL +Returns : An OGMRipSubpCodec, or NULL - -<anchor id="ogmrip-container-foreach-subp" role="function"/>ogmrip_container_foreach_subp () -ogmrip_container_foreach_subpvoid ogmrip_container_foreach_subp (OGMRipContainer *container, + +ogmrip_container_foreach_subp () +ogmrip_container_foreach_subpvoid ogmrip_container_foreach_subp (OGMRipContainer *container, OGMRipContainerCodecFunc func, gpointer data); @@ -496,9 +496,9 @@ User data to pass to the function - -<anchor id="ogmrip-container-add-chapters" role="function"/>ogmrip_container_add_chapters () -ogmrip_container_add_chaptersvoid ogmrip_container_add_chapters (OGMRipContainer *container, + +ogmrip_container_add_chapters () +ogmrip_container_add_chaptersvoid ogmrip_container_add_chapters (OGMRipContainer *container, OGMRipChapters *chapters, gint language); @@ -516,9 +516,9 @@ The language of the chapters - -<anchor id="ogmrip-container-get-chapters" role="function"/>ogmrip_container_get_chapters () -ogmrip_container_get_chaptersGSList* ogmrip_container_get_chapters (OGMRipContainer *container); + +ogmrip_container_get_chapters () +ogmrip_container_get_chaptersGSList* ogmrip_container_get_chapters (OGMRipContainer *container); Gets a list of the chapters codecs of the rip. @@ -530,9 +530,9 @@ Returns : A GSList, or NULL - -<anchor id="ogmrip-container-get-nth-chapters" role="function"/>ogmrip_container_get_nth_chapters () -ogmrip_container_get_nth_chaptersOGMRipChapters* ogmrip_container_get_nth_chapters (OGMRipContainer *container, + +ogmrip_container_get_nth_chapters () +ogmrip_container_get_nth_chaptersOGMRipChapters* ogmrip_container_get_nth_chapters (OGMRipContainer *container, gint n); Gets the chapters codec at the given position. @@ -548,9 +548,9 @@ Returns : An OGMRipChapters, or NULL - -<anchor id="ogmrip-container-get-n-chapters" role="function"/>ogmrip_container_get_n_chapters () -ogmrip_container_get_n_chaptersgint ogmrip_container_get_n_chapters (OGMRipContainer *container); + +ogmrip_container_get_n_chapters () +ogmrip_container_get_n_chaptersgint ogmrip_container_get_n_chapters (OGMRipContainer *container); Gets the number of chapters codecs. @@ -562,9 +562,9 @@ Returns : the number of chapters codecs - -<anchor id="ogmrip-container-foreach-chapters" role="function"/>ogmrip_container_foreach_chapters () -ogmrip_container_foreach_chaptersvoid ogmrip_container_foreach_chapters (OGMRipContainer *container, + +ogmrip_container_foreach_chapters () +ogmrip_container_foreach_chaptersvoid ogmrip_container_foreach_chapters (OGMRipContainer *container, OGMRipContainerCodecFunc func, gpointer data); @@ -582,9 +582,9 @@ User data to pass to the function - -<anchor id="ogmrip-container-add-file" role="function"/>ogmrip_container_add_file () -ogmrip_container_add_filevoid ogmrip_container_add_file (OGMRipContainer *container, + +ogmrip_container_add_file () +ogmrip_container_add_filevoid ogmrip_container_add_file (OGMRipContainer *container, OGMRipFile *file); Adds a file to the rip. @@ -598,9 +598,9 @@ An OOGMRipFile - -<anchor id="ogmrip-container-get-files" role="function"/>ogmrip_container_get_files () -ogmrip_container_get_filesGSList* ogmrip_container_get_files (OGMRipContainer *container); + +ogmrip_container_get_files () +ogmrip_container_get_filesGSList* ogmrip_container_get_files (OGMRipContainer *container); Gets a list of the files of the rip. @@ -612,9 +612,9 @@ Returns : A GSList, or NULL - -<anchor id="ogmrip-container-get-nth-file" role="function"/>ogmrip_container_get_nth_file () -ogmrip_container_get_nth_fileOGMRipFile* ogmrip_container_get_nth_file (OGMRipContainer *container, + +ogmrip_container_get_nth_file () +ogmrip_container_get_nth_fileOGMRipFile* ogmrip_container_get_nth_file (OGMRipContainer *container, gint n); Gets the file at the given position. @@ -630,9 +630,9 @@ Returns : An OGMRipFile, or NULL - -<anchor id="ogmrip-container-get-n-files" role="function"/>ogmrip_container_get_n_files () -ogmrip_container_get_n_filesgint ogmrip_container_get_n_files (OGMRipContainer *container); + +ogmrip_container_get_n_files () +ogmrip_container_get_n_filesgint ogmrip_container_get_n_files (OGMRipContainer *container); Gets the number of files. @@ -644,9 +644,9 @@ Returns : the number of files - -<anchor id="ogmrip-container-foreach-file" role="function"/>ogmrip_container_foreach_file () -ogmrip_container_foreach_filevoid ogmrip_container_foreach_file (OGMRipContainer *container, + +ogmrip_container_foreach_file () +ogmrip_container_foreach_filevoid ogmrip_container_foreach_file (OGMRipContainer *container, OGMRipContainerFileFunc func, gpointer data); @@ -664,9 +664,9 @@ User data to pass to the function - -<anchor id="ogmrip-container-set-split" role="function"/>ogmrip_container_set_split () -ogmrip_container_set_splitvoid ogmrip_container_set_split (OGMRipContainer *container, + +ogmrip_container_set_split () +ogmrip_container_set_splitvoid ogmrip_container_set_split (OGMRipContainer *container, guint number, guint size); @@ -684,9 +684,9 @@ The size of each file - -<anchor id="ogmrip-container-get-split" role="function"/>ogmrip_container_get_split () -ogmrip_container_get_splitvoid ogmrip_container_get_split (OGMRipContainer *container, + +ogmrip_container_get_split () +ogmrip_container_get_splitvoid ogmrip_container_get_split (OGMRipContainer *container, guint *number, guint *size); @@ -704,9 +704,53 @@ A pointer to store the size of each file - -<anchor id="ogmrip-container-get-overhead-size" role="function"/>ogmrip_container_get_overhead_size () -ogmrip_container_get_overhead_sizegint64 ogmrip_container_get_overhead_size (OGMRipContainer *container); + +ogmrip_container_get_start_delay () +ogmrip_container_get_start_delaygint ogmrip_container_get_start_delay (OGMRipContainer *container); + +Gets the start delay of the audio tracks. + + + +container : + An OGMRipContainer + +Returns : The start delay, or -1 + + + +ogmrip_container_set_start_delay () +ogmrip_container_set_start_delayvoid ogmrip_container_set_start_delay (OGMRipContainer *container, + guint start_delay); + +Sets the start delay of the audio tracks + + + +container : + An OGMRipContainer + +start_delay : + the start delay + + + +ogmrip_container_get_overhead () +ogmrip_container_get_overheadgint ogmrip_container_get_overhead (OGMRipContainer *container); + +Gets the overhead of the container. + + + +container : + An OGMRipContainer + +Returns : The overhead, or -1 + + + +ogmrip_container_get_overhead_size () +ogmrip_container_get_overhead_sizegint64 ogmrip_container_get_overhead_size (OGMRipContainer *container); Returns the size of the overhead generated by the video, audio and subtitle stream, the chapters information and the files in bytes. @@ -719,9 +763,9 @@ Returns : The overhead size - -<anchor id="ogmrip-container-get-nonvideo-size" role="function"/>ogmrip_container_get_nonvideo_size () -ogmrip_container_get_nonvideo_sizegint64 ogmrip_container_get_nonvideo_size (OGMRipContainer *container); + +ogmrip_container_get_nonvideo_size () +ogmrip_container_get_nonvideo_sizegint64 ogmrip_container_get_nonvideo_size (OGMRipContainer *container); Returns the size of the audio and subtitle streams, the chapters information and the files in bytes. @@ -736,35 +780,35 @@ - + Property Details -<anchor id="OGMRipContainer--fourcc"/>The "<literal>fourcc</literal>" property -OGMRipContainer:fourcc "fourcc" gchararray : Read / Write +The <literal>"fourcc"</literal> property +OGMRipContainer:fourcc "fourcc" gchar* : Read / Write Set fourcc.Default value: NULL -<anchor id="OGMRipContainer--label"/>The "<literal>label</literal>" property -OGMRipContainer:label "label" gchararray : Read / Write +The <literal>"label"</literal> property +OGMRipContainer:label "label" gchar* : Read / Write Set label.Default value: NULL -<anchor id="OGMRipContainer--output"/>The "<literal>output</literal>" property -OGMRipContainer:output "output" gchararray : Read / Write +The <literal>"output"</literal> property +OGMRipContainer:output "output" gchar* : Read / Write Set output file.Default value: NULL -<anchor id="OGMRipContainer--overhead"/>The "<literal>overhead</literal>" property -OGMRipContainer:overhead "overhead" guint : Read +The <literal>"overhead"</literal> property +OGMRipContainer:overhead "overhead" guint : Read Get overhead.Default value: 6 -<anchor id="OGMRipContainer--start-delay"/>The "<literal>start-delay</literal>" property -OGMRipContainer:start-delay "start-delay" guint : Read / Write +The <literal>"start-delay"</literal> property +OGMRipContainer:start-delay "start-delay" guint : Read / Write Set start delay.Allowed values: <= G_MAXINT Default value: 0 -<anchor id="OGMRipContainer--target-number"/>The "<literal>target-number</literal>" property -OGMRipContainer:target-number "target-number" guint : Read / Write +The <literal>"target-number"</literal> property +OGMRipContainer:target-number "target-number" guint : Read / Write Set target number.Default value: 1 -<anchor id="OGMRipContainer--target-size"/>The "<literal>target-size</literal>" property -OGMRipContainer:target-size "target-size" guint : Read / Write +The <literal>"target-size"</literal> property +OGMRipContainer:target-size "target-size" guint : Read / Write Set target size.Default value: 0 diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-dvdcpy.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-dvdcpy.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-dvdcpy.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-dvdcpy.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipDvdcpy +OGMRipDvdcpy 3 OGMRIP Library @@ -15,25 +15,22 @@ - + Synopsis #include <ogmrip-dvdcpy.h> - OGMRipDvdCpy; OGMJobSpawn* ogmrip_dvdcpy_new (OGMDvdTitle *title, const gchar *output); - - + Object Hierarchy - GObject +----OGMJobSpawn +----OGMJobContainer @@ -51,7 +48,7 @@ - + Description @@ -60,17 +57,17 @@ - + Details - -<anchor id="OGMRipDvdCpy-struct" role="struct"/>OGMRipDvdCpy -OGMRipDvdCpytypedef struct _OGMRipDvdCpy OGMRipDvdCpy; + +OGMRipDvdCpy +OGMRipDvdCpytypedef struct _OGMRipDvdCpy OGMRipDvdCpy; - -<anchor id="ogmrip-dvdcpy-new" role="function"/>ogmrip_dvdcpy_new () -ogmrip_dvdcpy_newOGMJobSpawn* ogmrip_dvdcpy_new (OGMDvdTitle *title, + +ogmrip_dvdcpy_new () +ogmrip_dvdcpy_newOGMJobSpawn* ogmrip_dvdcpy_new (OGMDvdTitle *title, const gchar *output); Creates a new OGMRipDvdcpy. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-edl.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-edl.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-edl.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-edl.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -Edit Decision List +Edit Decision List 3 OGMRIP Library @@ -15,14 +15,13 @@ - + Synopsis #include <ogmrip-edl.h> - enum OGMRipEdlAction; void (*OGMRipEdlFunc) (OGMRipEdlAction action, gdouble start, @@ -52,7 +51,7 @@ - + Description @@ -61,11 +60,11 @@ - + Details - -<anchor id="OGMRipEdlAction" role="enum"/>enum OGMRipEdlAction -OGMRipEdlActiontypedef enum + +enum OGMRipEdlAction +OGMRipEdlActiontypedef enum { OGMRIP_EDL_ACTION_SKIP, OGMRIP_EDL_ACTION_MUTE @@ -76,20 +75,20 @@ - -OGMRIP_EDL_ACTION_SKIP + +OGMRIP_EDL_ACTION_SKIP The skip action - -OGMRIP_EDL_ACTION_MUTE + +OGMRIP_EDL_ACTION_MUTE The mute action - -<anchor id="OGMRipEdlFunc" role="function"/>OGMRipEdlFunc () -OGMRipEdlFuncvoid (*OGMRipEdlFunc) (OGMRipEdlAction action, + +OGMRipEdlFunc () +OGMRipEdlFuncvoid (*OGMRipEdlFunc) (OGMRipEdlAction action, gdouble start, gdouble end, gpointer data); @@ -111,15 +110,15 @@ the user data - -<anchor id="OGMRipEdl" role="struct"/>OGMRipEdl -OGMRipEdltypedef struct _OGMRipEdl OGMRipEdl; + +OGMRipEdl +OGMRipEdltypedef struct _OGMRipEdl OGMRipEdl; - -<anchor id="ogmrip-edl-new" role="function"/>ogmrip_edl_new () -ogmrip_edl_newOGMRipEdl* ogmrip_edl_new (const gchar *filename); + +ogmrip_edl_new () +ogmrip_edl_newOGMRipEdl* ogmrip_edl_new (const gchar *filename); Creates a new OGMRipEdl. @@ -131,9 +130,9 @@ Returns : The new OGMRipEdl - -<anchor id="ogmrip-edl-ref" role="function"/>ogmrip_edl_ref () -ogmrip_edl_refvoid ogmrip_edl_ref (OGMRipEdl *edl); + +ogmrip_edl_ref () +ogmrip_edl_refvoid ogmrip_edl_ref (OGMRipEdl *edl); Increments the reference count of the OGMRipEdl. @@ -143,9 +142,9 @@ A OGMRipEdl - -<anchor id="ogmrip-edl-unref" role="function"/>ogmrip_edl_unref () -ogmrip_edl_unrefvoid ogmrip_edl_unref (OGMRipEdl *edl); + +ogmrip_edl_unref () +ogmrip_edl_unrefvoid ogmrip_edl_unref (OGMRipEdl *edl); Decrements the reference count of the OGMRipEdl and frees if the result is 0. @@ -155,9 +154,9 @@ A OGMRipEdl - -<anchor id="ogmrip-edl-get-filename" role="function"/>ogmrip_edl_get_filename () -ogmrip_edl_get_filenamegchar* ogmrip_edl_get_filename (OGMRipEdl *edl); + +ogmrip_edl_get_filename () +ogmrip_edl_get_filenamegchar* ogmrip_edl_get_filename (OGMRipEdl *edl); Gets the filename of the EDL. @@ -169,9 +168,9 @@ Returns : The filename - -<anchor id="ogmrip-edl-add" role="function"/>ogmrip_edl_add () -ogmrip_edl_addvoid ogmrip_edl_add (OGMRipEdl *edl, + +ogmrip_edl_add () +ogmrip_edl_addvoid ogmrip_edl_add (OGMRipEdl *edl, OGMRipEdlAction action, gdouble start, gdouble end); @@ -193,9 +192,9 @@ The end in seconds - -<anchor id="ogmrip-edl-foreach" role="function"/>ogmrip_edl_foreach () -ogmrip_edl_foreachvoid ogmrip_edl_foreach (OGMRipEdl *edl, + +ogmrip_edl_foreach () +ogmrip_edl_foreachvoid ogmrip_edl_foreach (OGMRipEdl *edl, OGMRipEdlFunc func, gpointer data); @@ -213,9 +212,9 @@ The user data - -<anchor id="ogmrip-edl-dump" role="function"/>ogmrip_edl_dump () -ogmrip_edl_dumpgboolean ogmrip_edl_dump (OGMRipEdl *edl); + +ogmrip_edl_dump () +ogmrip_edl_dumpgboolean ogmrip_edl_dump (OGMRipEdl *edl); Writes the EDL in the given file. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-enums.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-enums.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-enums.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-enums.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -Enumerations +Enumerations 3 OGMRIP Library @@ -15,13 +15,10 @@ - + Synopsis - - - enum OGMRipFormatType; enum OGMRipScalerType; enum OGMRipDeintType; @@ -41,19 +38,21 @@ - + Description - + Details - -<anchor id="OGMRipFormatType" role="enum"/>enum OGMRipFormatType -OGMRipFormatTypetypedef enum + +enum OGMRipFormatType +OGMRipFormatTypetypedef enum { + OGMRIP_FORMAT_MPEG1, + OGMRIP_FORMAT_MPEG2, OGMRIP_FORMAT_MPEG4, OGMRIP_FORMAT_H264, OGMRIP_FORMAT_THEORA, @@ -86,135 +85,145 @@ - -OGMRIP_FORMAT_MPEG4 + +OGMRIP_FORMAT_MPEG1 + The Mpeg-1 video format + + + +OGMRIP_FORMAT_MPEG2 + The Mpeg-2 video format + + + +OGMRIP_FORMAT_MPEG4 The Mpeg-4 video format - -OGMRIP_FORMAT_H264 + +OGMRIP_FORMAT_H264 The H264 video format - -OGMRIP_FORMAT_THEORA + +OGMRIP_FORMAT_THEORA The Ogg Theora video format - -OGMRIP_FORMAT_PCM + +OGMRIP_FORMAT_PCM The PCM audio format - -OGMRIP_FORMAT_MP3 + +OGMRIP_FORMAT_MP3 The MP3 audio format - -OGMRIP_FORMAT_AC3 + +OGMRIP_FORMAT_AC3 The AC3 audio format - -OGMRIP_FORMAT_DTS + +OGMRIP_FORMAT_DTS The DTS audio format - -OGMRIP_FORMAT_AAC + +OGMRIP_FORMAT_AAC The AAC audio format - -OGMRIP_FORMAT_VORBIS + +OGMRIP_FORMAT_VORBIS The Ogg Vorbis audio format - -OGMRIP_FORMAT_MICRODVD + +OGMRIP_FORMAT_MICRODVD The MicroDVD subtitle format - -OGMRIP_FORMAT_SUBRIP + +OGMRIP_FORMAT_SUBRIP The SubRip subtitle format - -OGMRIP_FORMAT_SRT + +OGMRIP_FORMAT_SRT The SRT subtitle format - -OGMRIP_FORMAT_SAMI + +OGMRIP_FORMAT_SAMI The SAMI subtitle format - -OGMRIP_FORMAT_VPLAYER + +OGMRIP_FORMAT_VPLAYER The VPlayer subtitle format - -OGMRIP_FORMAT_RT + +OGMRIP_FORMAT_RT The RT subtitle format - -OGMRIP_FORMAT_SSA + +OGMRIP_FORMAT_SSA The SSA subtitle format - -OGMRIP_FORMAT_PJS + +OGMRIP_FORMAT_PJS The RJS subtitle format - -OGMRIP_FORMAT_MPSUB + +OGMRIP_FORMAT_MPSUB The Mplayer subtitle format - -OGMRIP_FORMAT_AQT + +OGMRIP_FORMAT_AQT The AQT subtitle format - -OGMRIP_FORMAT_SRT_2_0 + +OGMRIP_FORMAT_SRT_2_0 The SRT version 2 subtitle format - -OGMRIP_FORMAT_SUBRIP_0_9 + +OGMRIP_FORMAT_SUBRIP_0_9 The SubRip version 0.9 subtitle format - -OGMRIP_FORMAT_JACOSUB + +OGMRIP_FORMAT_JACOSUB The JacoSub subtitle format - -OGMRIP_FORMAT_MPL_2 + +OGMRIP_FORMAT_MPL_2 The MPlayer version subtitle format - -OGMRIP_FORMAT_VOBSUB + +OGMRIP_FORMAT_VOBSUB The VobSub subtitle format - -OGMRIP_FORMAT_COPY + +OGMRIP_FORMAT_COPY A format for internal use only - -<anchor id="OGMRipScalerType" role="enum"/>enum OGMRipScalerType -OGMRipScalerTypetypedef enum + +enum OGMRipScalerType +OGMRipScalerTypetypedef enum { OGMRIP_SCALER_FAST_BILINEAR, OGMRIP_SCALER_BILINEAR, @@ -234,65 +243,65 @@ - -OGMRIP_SCALER_FAST_BILINEAR + +OGMRIP_SCALER_FAST_BILINEAR Fast bilinear - -OGMRIP_SCALER_BILINEAR + +OGMRIP_SCALER_BILINEAR Bilinear - -OGMRIP_SCALER_BICUBIC + +OGMRIP_SCALER_BICUBIC Bicubic (good quality) - -OGMRIP_SCALER_EXPERIMENTAL + +OGMRIP_SCALER_EXPERIMENTAL Experimental - -OGMRIP_SCALER_NEAREST_NEIGHBOUR + +OGMRIP_SCALER_NEAREST_NEIGHBOUR Nearest neighbour (bad quality) - -OGMRIP_SCALER_AREA + +OGMRIP_SCALER_AREA Area - -OGMRIP_SCALER_LUMA_BICUBIC_CHROMA_BILINEAR + +OGMRIP_SCALER_LUMA_BICUBIC_CHROMA_BILINEAR Luma bicubic / Chroma bilinear - -OGMRIP_SCALER_GAUSS + +OGMRIP_SCALER_GAUSS Gauss (best for downscaling) - -OGMRIP_SCALER_SINCR + +OGMRIP_SCALER_SINCR SincR - -OGMRIP_SCALER_LANCZOS + +OGMRIP_SCALER_LANCZOS Lanczos - -OGMRIP_SCALER_BICUBIC_SPLINE + +OGMRIP_SCALER_BICUBIC_SPLINE Natural bicubic spline - -<anchor id="OGMRipDeintType" role="enum"/>enum OGMRipDeintType -OGMRipDeintTypetypedef enum + +enum OGMRipDeintType +OGMRipDeintTypetypedef enum { OGMRIP_DEINT_NONE, OGMRIP_DEINT_LINEAR_BLEND, @@ -310,59 +319,59 @@ - -OGMRIP_DEINT_NONE + +OGMRIP_DEINT_NONE No deinterlacing - -OGMRIP_DEINT_LINEAR_BLEND + +OGMRIP_DEINT_LINEAR_BLEND Linear blend - -OGMRIP_DEINT_LINEAR_INTERPOLATING + +OGMRIP_DEINT_LINEAR_INTERPOLATING Linear interpolating - -OGMRIP_DEINT_CUBIC_INTERPOLATING + +OGMRIP_DEINT_CUBIC_INTERPOLATING Cubic interpolating - -OGMRIP_DEINT_MEDIAN + +OGMRIP_DEINT_MEDIAN Median - -OGMRIP_DEINT_FFMPEG + +OGMRIP_DEINT_FFMPEG FFMpeg - -OGMRIP_DEINT_LOWPASS + +OGMRIP_DEINT_LOWPASS Lowpass - -OGMRIP_DEINT_KERNEL + +OGMRIP_DEINT_KERNEL Kernel - -OGMRIP_DEINT_YADIF + +OGMRIP_DEINT_YADIF Yadif (best) - -<anchor id="OGMRipQualityType" role="enum"/>enum OGMRipQualityType -OGMRipQualityTypetypedef enum + +enum OGMRipQualityType +OGMRipQualityTypetypedef enum { - OGMRIP_QUALITY_VERY_HIGH, + OGMRIP_QUALITY_EXTREME, OGMRIP_QUALITY_HIGH, - OGMRIP_QUALITY_FAST + OGMRIP_QUALITY_NORMAL } OGMRipQualityType; @@ -370,25 +379,25 @@ - -OGMRIP_QUALITY_VERY_HIGH - Very high quality + +OGMRIP_QUALITY_EXTREME + Extreme quality - -OGMRIP_QUALITY_HIGH + +OGMRIP_QUALITY_HIGH High quality - -OGMRIP_QUALITY_FAST - Low quality + +OGMRIP_QUALITY_NORMAL + Normal quality - -<anchor id="OGMRipCharset" role="enum"/>enum OGMRipCharset -OGMRipCharsettypedef enum + +enum OGMRipCharset +OGMRipCharsettypedef enum { OGMRIP_CHARSET_UTF8, OGMRIP_CHARSET_ISO8859_1, @@ -400,25 +409,25 @@ - -OGMRIP_CHARSET_UTF8 + +OGMRIP_CHARSET_UTF8 UTF-8 charset - -OGMRIP_CHARSET_ISO8859_1 + +OGMRIP_CHARSET_ISO8859_1 ISO8859-1 charset - -OGMRIP_CHARSET_ASCII + +OGMRIP_CHARSET_ASCII ASCII - -<anchor id="OGMRipEolStyle" role="enum"/>enum OGMRipEolStyle -OGMRipEolStyletypedef enum + +enum OGMRipEolStyle +OGMRipEolStyletypedef enum { OGMRIP_EOL_CR, OGMRIP_EOL_CR_LF @@ -429,20 +438,20 @@ - -OGMRIP_EOL_CR + +OGMRIP_EOL_CR Carriage return only - -OGMRIP_EOL_CR_LF + +OGMRIP_EOL_CR_LF Carriage return + line feed - -<anchor id="OGMRipAudioDemuxer" role="enum"/>enum OGMRipAudioDemuxer -OGMRipAudioDemuxertypedef enum + +enum OGMRipAudioDemuxer +OGMRipAudioDemuxertypedef enum { OGMRIP_AUDIO_DEMUXER_AUTO = 0, OGMRIP_AUDIO_DEMUXER_AC3 = 0x2000, @@ -454,25 +463,25 @@ - -OGMRIP_AUDIO_DEMUXER_AUTO + +OGMRIP_AUDIO_DEMUXER_AUTO The demuxer is autodetected - -OGMRIP_AUDIO_DEMUXER_AC3 + +OGMRIP_AUDIO_DEMUXER_AC3 The AC3 demuxer must be used - -OGMRIP_AUDIO_DEMUXER_DTS + +OGMRIP_AUDIO_DEMUXER_DTS The DTS demuxer must be used - -<anchor id="OGMRipSubpDemuxer" role="enum"/>enum OGMRipSubpDemuxer -OGMRipSubpDemuxertypedef enum + +enum OGMRipSubpDemuxer +OGMRipSubpDemuxertypedef enum { OGMRIP_SUBP_DEMUXER_AUTO, OGMRIP_SUBP_DEMUXER_VOBSUB @@ -483,13 +492,13 @@ - -OGMRIP_SUBP_DEMUXER_AUTO + +OGMRIP_SUBP_DEMUXER_AUTO The demuxer is autodetected - -OGMRIP_SUBP_DEMUXER_VOBSUB + +OGMRIP_SUBP_DEMUXER_VOBSUB The VobSub demuxer must be used diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-file.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-file.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-file.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-file.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -Files +Files 3 OGMRIP Library @@ -15,14 +15,13 @@ - + Synopsis #include <ogmrip-file.h> - OGMRipFile; OGMRipVideoFile; OGMRipAudioFile; @@ -55,10 +54,10 @@ gint ogmrip_audio_file_get_sample_rate (OGMRipAudioFile *audio); gint ogmrip_audio_file_get_samples_per_frame (OGMRipAudioFile *audio); +gint ogmrip_audio_file_get_channels (OGMRipAudioFile *audio); OGMRipFile* ogmrip_subp_file_new (const gchar *filename, GError **error); gint ogmrip_subp_file_get_charset (OGMRipSubpFile *subp); - @@ -70,7 +69,7 @@ - + Description @@ -79,35 +78,35 @@ - + Details - -<anchor id="OGMRipFile" role="struct"/>OGMRipFile -OGMRipFiletypedef struct _OGMRipFile OGMRipFile; + +OGMRipFile +OGMRipFiletypedef struct _OGMRipFile OGMRipFile; - -<anchor id="OGMRipVideoFile" role="struct"/>OGMRipVideoFile -OGMRipVideoFiletypedef struct _OGMRipVideoFile OGMRipVideoFile; + +OGMRipVideoFile +OGMRipVideoFiletypedef struct _OGMRipVideoFile OGMRipVideoFile; - -<anchor id="OGMRipAudioFile" role="struct"/>OGMRipAudioFile -OGMRipAudioFiletypedef struct _OGMRipAudioFile OGMRipAudioFile; + +OGMRipAudioFile +OGMRipAudioFiletypedef struct _OGMRipAudioFile OGMRipAudioFile; - -<anchor id="OGMRipSubpFile" role="struct"/>OGMRipSubpFile -OGMRipSubpFiletypedef struct _OGMRipSubpFile OGMRipSubpFile; + +OGMRipSubpFile +OGMRipSubpFiletypedef struct _OGMRipSubpFile OGMRipSubpFile; - -<anchor id="OGMRipFileType" role="enum"/>enum OGMRipFileType -OGMRipFileTypetypedef enum + +enum OGMRipFileType +OGMRipFileTypetypedef enum { OGMRIP_FILE_TYPE_VIDEO, OGMRIP_FILE_TYPE_AUDIO, @@ -119,25 +118,25 @@ - -OGMRIP_FILE_TYPE_VIDEO + +OGMRIP_FILE_TYPE_VIDEO The file contains a video stream - -OGMRIP_FILE_TYPE_AUDIO + +OGMRIP_FILE_TYPE_AUDIO The file contains an audio stream - -OGMRIP_FILE_TYPE_SUBP + +OGMRIP_FILE_TYPE_SUBP The file contains a subtitle stream - -<anchor id="OGMRipFileError" role="enum"/>enum OGMRipFileError -OGMRipFileErrortypedef enum + +enum OGMRipFileError +OGMRipFileErrortypedef enum { OGMRIP_FILE_ERROR_UNKNOWN, OGMRIP_FILE_ERROR_RANGE, @@ -156,60 +155,60 @@ - -OGMRIP_FILE_ERROR_UNKNOWN + +OGMRIP_FILE_ERROR_UNKNOWN Unknown error - -OGMRIP_FILE_ERROR_RANGE + +OGMRIP_FILE_ERROR_RANGE Range error - -OGMRIP_FILE_ERROR_BITRATE + +OGMRIP_FILE_ERROR_BITRATE Impossible to get bitrate - -OGMRIP_FILE_ERROR_RATE + +OGMRIP_FILE_ERROR_RATE Impossible to get rate - -OGMRIP_FILE_ERROR_LENGTH + +OGMRIP_FILE_ERROR_LENGTH Impossible to get length - -OGMRIP_FILE_ERROR_FORMAT + +OGMRIP_FILE_ERROR_FORMAT Impossible to get format - -OGMRIP_FILE_ERROR_WIDTH + +OGMRIP_FILE_ERROR_WIDTH Impossible to get width - -OGMRIP_FILE_ERROR_HEIGHT + +OGMRIP_FILE_ERROR_HEIGHT Impossible to get height - -OGMRIP_FILE_ERROR_ASPECT + +OGMRIP_FILE_ERROR_ASPECT Impossible to get aspect - -OGMRIP_FILE_ERROR_FPS + +OGMRIP_FILE_ERROR_FPS Impossible to get fps - -<anchor id="OGMRIP-FILE-ERROR:CAPS" role="macro"/>OGMRIP_FILE_ERROR -OGMRIP_FILE_ERROR#define OGMRIP_FILE_ERROR ogmrip_file_error_quark () + +OGMRIP_FILE_ERROR +OGMRIP_FILE_ERROR#define OGMRIP_FILE_ERROR ogmrip_file_error_quark () Error domain for file operations. Errors in this domain will be from the @@ -217,9 +216,9 @@ - -<anchor id="ogmrip-file-ref" role="function"/>ogmrip_file_ref () -ogmrip_file_refvoid ogmrip_file_ref (OGMRipFile *file); + +ogmrip_file_ref () +ogmrip_file_refvoid ogmrip_file_ref (OGMRipFile *file); Increments the reference count of an OGMRipFile. @@ -229,9 +228,9 @@ an OGMRipFile - -<anchor id="ogmrip-file-unref" role="function"/>ogmrip_file_unref () -ogmrip_file_unrefvoid ogmrip_file_unref (OGMRipFile *file); + +ogmrip_file_unref () +ogmrip_file_unrefvoid ogmrip_file_unref (OGMRipFile *file); Decrements the reference count of an OGMRipFile. @@ -241,9 +240,9 @@ an OGMRipFile - -<anchor id="ogmrip-file-get-type" role="function"/>ogmrip_file_get_type () -ogmrip_file_get_typegint ogmrip_file_get_type (OGMRipFile *file); + +ogmrip_file_get_type () +ogmrip_file_get_typegint ogmrip_file_get_type (OGMRipFile *file); Gets the type of a file. @@ -255,9 +254,9 @@ Returns : An OGMRipFileType, or -1 - -<anchor id="ogmrip-file-get-format" role="function"/>ogmrip_file_get_format () -ogmrip_file_get_formatgint ogmrip_file_get_format (OGMRipFile *file); + +ogmrip_file_get_format () +ogmrip_file_get_formatgint ogmrip_file_get_format (OGMRipFile *file); Gets the format of a file. @@ -269,9 +268,9 @@ Returns : An OGMRipFormatType, or -1 - -<anchor id="ogmrip-file-get-size" role="function"/>ogmrip_file_get_size () -ogmrip_file_get_sizegint64 ogmrip_file_get_size (OGMRipFile *file); + +ogmrip_file_get_size () +ogmrip_file_get_sizegint64 ogmrip_file_get_size (OGMRipFile *file); Gets the size of a file in bytes. @@ -283,9 +282,9 @@ Returns : The file size, or -1 - -<anchor id="ogmrip-file-get-filename" role="function"/>ogmrip_file_get_filename () -ogmrip_file_get_filenamegchar* ogmrip_file_get_filename (OGMRipFile *file); + +ogmrip_file_get_filename () +ogmrip_file_get_filenamegchar* ogmrip_file_get_filename (OGMRipFile *file); Gets the filename of a file. @@ -297,9 +296,9 @@ Returns : The filename, or NULL - -<anchor id="ogmrip-file-set-language" role="function"/>ogmrip_file_set_language () -ogmrip_file_set_languagevoid ogmrip_file_set_language (OGMRipFile *file, + +ogmrip_file_set_language () +ogmrip_file_set_languagevoid ogmrip_file_set_language (OGMRipFile *file, gint lang); Sets the language of a file. @@ -313,9 +312,9 @@ A language code - -<anchor id="ogmrip-file-get-language" role="function"/>ogmrip_file_get_language () -ogmrip_file_get_languagegint ogmrip_file_get_language (OGMRipFile *file); + +ogmrip_file_get_language () +ogmrip_file_get_languagegint ogmrip_file_get_language (OGMRipFile *file); Gets the language of a file. @@ -327,9 +326,9 @@ Returns : A language code, or -1 - -<anchor id="ogmrip-video-file-new" role="function"/>ogmrip_video_file_new () -ogmrip_video_file_newOGMRipFile* ogmrip_video_file_new (const gchar *filename, + +ogmrip_video_file_new () +ogmrip_video_file_newOGMRipFile* ogmrip_video_file_new (const gchar *filename, GError **error); Creates a new OGMRipVideoFile from a video file. @@ -345,9 +344,9 @@ Returns : The new OGMRipVideoFile - -<anchor id="ogmrip-video-file-get-bitrate" role="function"/>ogmrip_video_file_get_bitrate () -ogmrip_video_file_get_bitrategint ogmrip_video_file_get_bitrate (OGMRipVideoFile *video); + +ogmrip_video_file_get_bitrate () +ogmrip_video_file_get_bitrategint ogmrip_video_file_get_bitrate (OGMRipVideoFile *video); Gets the bitrate of a video file. @@ -359,9 +358,9 @@ Returns : The bitrate, or -1 - -<anchor id="ogmrip-video-file-get-length" role="function"/>ogmrip_video_file_get_length () -ogmrip_video_file_get_lengthgdouble ogmrip_video_file_get_length (OGMRipVideoFile *video); + +ogmrip_video_file_get_length () +ogmrip_video_file_get_lengthgdouble ogmrip_video_file_get_length (OGMRipVideoFile *video); Gets the length in seconds of a video file. @@ -373,9 +372,9 @@ Returns : The length, or -1.0 - -<anchor id="ogmrip-video-file-get-size" role="function"/>ogmrip_video_file_get_size () -ogmrip_video_file_get_sizevoid ogmrip_video_file_get_size (OGMRipVideoFile *video, + +ogmrip_video_file_get_size () +ogmrip_video_file_get_sizevoid ogmrip_video_file_get_size (OGMRipVideoFile *video, guint *width, guint *height); @@ -393,9 +392,9 @@ A pointer to store the height, or NULL - -<anchor id="ogmrip-video-file-get-framerate" role="function"/>ogmrip_video_file_get_framerate () -ogmrip_video_file_get_framerategdouble ogmrip_video_file_get_framerate (OGMRipVideoFile *video); + +ogmrip_video_file_get_framerate () +ogmrip_video_file_get_framerategdouble ogmrip_video_file_get_framerate (OGMRipVideoFile *video); Gets the framerate of a video file. @@ -407,9 +406,9 @@ Returns : The framerate, or -1 - -<anchor id="ogmrip-video-file-get-aspect-ratio" role="function"/>ogmrip_video_file_get_aspect_ratio () -ogmrip_video_file_get_aspect_ratiogdouble ogmrip_video_file_get_aspect_ratio (OGMRipVideoFile *video); + +ogmrip_video_file_get_aspect_ratio () +ogmrip_video_file_get_aspect_ratiogdouble ogmrip_video_file_get_aspect_ratio (OGMRipVideoFile *video); Gets the aspect ratio of a video file. @@ -421,9 +420,9 @@ Returns : The aspect ratio, or -1 - -<anchor id="ogmrip-audio-file-new" role="function"/>ogmrip_audio_file_new () -ogmrip_audio_file_newOGMRipFile* ogmrip_audio_file_new (const gchar *filename, + +ogmrip_audio_file_new () +ogmrip_audio_file_newOGMRipFile* ogmrip_audio_file_new (const gchar *filename, GError **error); Creates a new OGMRipAudioFile from au audio file. @@ -439,9 +438,9 @@ Returns : The new OGMRipAudioFile - -<anchor id="ogmrip-audio-file-get-bitrate" role="function"/>ogmrip_audio_file_get_bitrate () -ogmrip_audio_file_get_bitrategint ogmrip_audio_file_get_bitrate (OGMRipAudioFile *audio); + +ogmrip_audio_file_get_bitrate () +ogmrip_audio_file_get_bitrategint ogmrip_audio_file_get_bitrate (OGMRipAudioFile *audio); Gets the bitrate of an audio file. @@ -453,9 +452,9 @@ Returns : The bitrate, or -1 - -<anchor id="ogmrip-audio-file-get-length" role="function"/>ogmrip_audio_file_get_length () -ogmrip_audio_file_get_lengthgdouble ogmrip_audio_file_get_length (OGMRipAudioFile *audio); + +ogmrip_audio_file_get_length () +ogmrip_audio_file_get_lengthgdouble ogmrip_audio_file_get_length (OGMRipAudioFile *audio); Gets the length in seconds of an audio file. @@ -467,9 +466,9 @@ Returns : The length, or -1.0 - -<anchor id="ogmrip-audio-file-get-sample-rate" role="function"/>ogmrip_audio_file_get_sample_rate () -ogmrip_audio_file_get_sample_rategint ogmrip_audio_file_get_sample_rate (OGMRipAudioFile *audio); + +ogmrip_audio_file_get_sample_rate () +ogmrip_audio_file_get_sample_rategint ogmrip_audio_file_get_sample_rate (OGMRipAudioFile *audio); Gets the sample rate of an audio file. @@ -481,9 +480,9 @@ Returns : The sample rate, or -1 - -<anchor id="ogmrip-audio-file-get-samples-per-frame" role="function"/>ogmrip_audio_file_get_samples_per_frame () -ogmrip_audio_file_get_samples_per_framegint ogmrip_audio_file_get_samples_per_frame + +ogmrip_audio_file_get_samples_per_frame () +ogmrip_audio_file_get_samples_per_framegint ogmrip_audio_file_get_samples_per_frame (OGMRipAudioFile *audio); Gets the number of samples per frame of an audio file. @@ -496,9 +495,23 @@ Returns : The number of samples per frame, or -1 - -<anchor id="ogmrip-subp-file-new" role="function"/>ogmrip_subp_file_new () -ogmrip_subp_file_newOGMRipFile* ogmrip_subp_file_new (const gchar *filename, + +ogmrip_audio_file_get_channels () +ogmrip_audio_file_get_channelsgint ogmrip_audio_file_get_channels (OGMRipAudioFile *audio); + +Gets the number of channels of an audio file. + + + +audio : + An OGMRipAudioFile + +Returns : an OGMDvdAudioChannels, or -1 + + + +ogmrip_subp_file_new () +ogmrip_subp_file_newOGMRipFile* ogmrip_subp_file_new (const gchar *filename, GError **error); Creates a new OGMRipSubpFile from a subtitle file. @@ -514,9 +527,9 @@ Returns : The new OGMRipSubpFile - -<anchor id="ogmrip-subp-file-get-charset" role="function"/>ogmrip_subp_file_get_charset () -ogmrip_subp_file_get_charsetgint ogmrip_subp_file_get_charset (OGMRipSubpFile *subp); + +ogmrip_subp_file_get_charset () +ogmrip_subp_file_get_charsetgint ogmrip_subp_file_get_charset (OGMRipSubpFile *subp); Gets the character set of a subtitle file. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-fs.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-fs.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-fs.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-fs.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -Filesystem +Filesystem 3 OGMRIP Library @@ -15,16 +15,15 @@ - + Synopsis #include <ogmrip-fs.h> - -enum OGMRipFsError; -#define OGMRIP_FS_ERROR +void ogmrip_fs_unref (gchar *filename, + gboolean do_unlink); gchar* ogmrip_fs_get_tmp_dir (void); void ogmrip_fs_set_tmp_dir (const gchar *dir); gboolean ogmrip_fs_mkdir (const gchar *path, @@ -46,10 +45,13 @@ gint ogmrip_fs_open_tmp (const gchar *tmpl, gchar **name_used, GError **error); -gint64 ogmrip_fs_get_left_space (const gchar *filename); -gchar* ogmrip_fs_get_mount_point (const gchar *filename); -void ogmrip_fs_unref (gchar *filename, - gboolean do_unlink); +gint64 ogmrip_fs_get_left_space (const gchar *filename, + GError **error); +gchar* ogmrip_fs_get_mount_point (const gchar *filename, + GError **error); +gchar* ogmrip_fs_get_extension (const gchar *filename); +gchar* ogmrip_fs_set_extension (const gchar *filename, + const gchar *extension); gboolean ogmrip_fs_rename (const gchar *old_name, const gchar *new_name, GError **error); @@ -64,7 +66,7 @@ - + Description @@ -73,45 +75,28 @@ - + Details - -<anchor id="OGMRipFsError" role="enum"/>enum OGMRipFsError -OGMRipFsErrortypedef enum -{ - OGMRIP_FS_ERROR_NONE, - OGMRIP_FS_ERROR_INTERNAL -} OGMRipFsError; - - -Error codes returned by OGMRipFs functions. - - - - -OGMRIP_FS_ERROR_NONE - No error - - - -OGMRIP_FS_ERROR_INTERNAL - Unknown error - - - - -<anchor id="OGMRIP-FS-ERROR:CAPS" role="macro"/>OGMRIP_FS_ERROR -OGMRIP_FS_ERROR#define OGMRIP_FS_ERROR ogmrip_fs_error_quark () - - -Error domain for fs operations. Errors in this domain will be from the -OGMRipFsError enumeration. See GError for information on error domains. - - - - -<anchor id="ogmrip-fs-get-tmp-dir" role="function"/>ogmrip_fs_get_tmp_dir () -ogmrip_fs_get_tmp_dirgchar* ogmrip_fs_get_tmp_dir (void); + +ogmrip_fs_unref () +ogmrip_fs_unrefvoid ogmrip_fs_unref (gchar *filename, + gboolean do_unlink); + +If do_unlink is TRUE, recursively removes filename then frees the memory +pointed to by filename. + + + +filename : + A path to a filename + +do_unlink : + TRUE to also remove the file + + + +ogmrip_fs_get_tmp_dir () +ogmrip_fs_get_tmp_dirgchar* ogmrip_fs_get_tmp_dir (void); Returns OGMRip's temporary directory. @@ -120,9 +105,9 @@ Returns : The temporaty directory - -<anchor id="ogmrip-fs-set-tmp-dir" role="function"/>ogmrip_fs_set_tmp_dir () -ogmrip_fs_set_tmp_dirvoid ogmrip_fs_set_tmp_dir (const gchar *dir); + +ogmrip_fs_set_tmp_dir () +ogmrip_fs_set_tmp_dirvoid ogmrip_fs_set_tmp_dir (const gchar *dir); Sets OGMRip's temporary directory. If dir is NULL, OGMRip's temporary directory will be the system's temporary directory. @@ -133,9 +118,9 @@ The new temporary directory - -<anchor id="ogmrip-fs-mkdir" role="function"/>ogmrip_fs_mkdir () -ogmrip_fs_mkdirgboolean ogmrip_fs_mkdir (const gchar *path, + +ogmrip_fs_mkdir () +ogmrip_fs_mkdirgboolean ogmrip_fs_mkdir (const gchar *path, mode_t mode, GError **error); @@ -150,14 +135,14 @@ The file mode error : - A location to return an error of type OGMRIP_FS_ERROR + A location to return an error of type G_FILE_ERROR Returns : TRUE on success, FALSE if an error was set - -<anchor id="ogmrip-fs-rmdir" role="function"/>ogmrip_fs_rmdir () -ogmrip_fs_rmdirgboolean ogmrip_fs_rmdir (const gchar *path, + +ogmrip_fs_rmdir () +ogmrip_fs_rmdirgboolean ogmrip_fs_rmdir (const gchar *path, gboolean recursive, GError **error); @@ -178,9 +163,9 @@ Returns : TRUE on success, FALSE if an error was set - -<anchor id="ogmrip-fs-mktemp" role="function"/>ogmrip_fs_mktemp () -ogmrip_fs_mktempgchar* ogmrip_fs_mktemp (const gchar *tmpl, + +ogmrip_fs_mktemp () +ogmrip_fs_mktempgchar* ogmrip_fs_mktemp (const gchar *tmpl, GError **error); Creates a file in OGMRip's temporary directory (as returned by @@ -197,9 +182,9 @@ Returns : The actual name used, or NULL - -<anchor id="ogmrip-fs-mkftemp" role="function"/>ogmrip_fs_mkftemp () -ogmrip_fs_mkftempgchar* ogmrip_fs_mkftemp (const gchar *tmpl, + +ogmrip_fs_mkftemp () +ogmrip_fs_mkftempgchar* ogmrip_fs_mkftemp (const gchar *tmpl, GError **error); Creates a fifo in OGMRip's temporary directory (as returned by @@ -216,9 +201,9 @@ Returns : The actual name used, or NULL - -<anchor id="ogmrip-fs-mkdtemp" role="function"/>ogmrip_fs_mkdtemp () -ogmrip_fs_mkdtempgchar* ogmrip_fs_mkdtemp (const gchar *tmpl, + +ogmrip_fs_mkdtemp () +ogmrip_fs_mkdtempgchar* ogmrip_fs_mkdtemp (const gchar *tmpl, GError **error); Creates a directory in OGMRip's temporary directory (as returned by @@ -235,9 +220,9 @@ Returns : The actual name used, or NULL - -<anchor id="ogmrip-fs-lntemp" role="function"/>ogmrip_fs_lntemp () -ogmrip_fs_lntempgchar* ogmrip_fs_lntemp (const gchar *oldpath, + +ogmrip_fs_lntemp () +ogmrip_fs_lntempgchar* ogmrip_fs_lntemp (const gchar *oldpath, const gchar *newtmpl, gboolean symln, GError **error); @@ -262,9 +247,9 @@ Returns : The actual name used, or NULL - -<anchor id="ogmrip-fs-open-tmp" role="function"/>ogmrip_fs_open_tmp () -ogmrip_fs_open_tmpgint ogmrip_fs_open_tmp (const gchar *tmpl, + +ogmrip_fs_open_tmp () +ogmrip_fs_open_tmpgint ogmrip_fs_open_tmp (const gchar *tmpl, gchar **name_used, GError **error); @@ -288,9 +273,10 @@ -1 is returned and error will be set. - -<anchor id="ogmrip-fs-get-left-space" role="function"/>ogmrip_fs_get_left_space () -ogmrip_fs_get_left_spacegint64 ogmrip_fs_get_left_space (const gchar *filename); + +ogmrip_fs_get_left_space () +ogmrip_fs_get_left_spacegint64 ogmrip_fs_get_left_space (const gchar *filename, + GError **error); Returns the space left in bytes on the device containing filename. @@ -299,12 +285,16 @@ filename : A path to a filename +error : + A location to return an error of type G_FILE_ERROR + Returns : The space left in bytes, or -1 - -<anchor id="ogmrip-fs-get-mount-point" role="function"/>ogmrip_fs_get_mount_point () -ogmrip_fs_get_mount_pointgchar* ogmrip_fs_get_mount_point (const gchar *filename); + +ogmrip_fs_get_mount_point () +ogmrip_fs_get_mount_pointgchar* ogmrip_fs_get_mount_point (const gchar *filename, + GError **error); Returns the mount point of the device containing filename. @@ -313,29 +303,48 @@ filename : A path to a filename +error : + A location to return an error of type G_FILE_ERROR + Returns : The moint point, or NULL - -<anchor id="ogmrip-fs-unref" role="function"/>ogmrip_fs_unref () -ogmrip_fs_unrefvoid ogmrip_fs_unref (gchar *filename, - gboolean do_unlink); + +ogmrip_fs_get_extension () +ogmrip_fs_get_extensiongchar* ogmrip_fs_get_extension (const gchar *filename); -If do_unlink is TRUE, recursively removes filename then frees the memory -pointed to by filename. +Returns the extension of filename. filename : - A path to a filename + The path to an existing filename -do_unlink : - TRUE to also remove the file +Returns : The extension, or NULL + + + +ogmrip_fs_set_extension () +ogmrip_fs_set_extensiongchar* ogmrip_fs_set_extension (const gchar *filename, + const gchar *extension); + +If filename already has an extension, replaces it with extension. If not, +appends extension to filename. + + + +filename : + The path to an existing filename + +extension : + The new extension + +Returns : The new name of the file, or NULL - -<anchor id="ogmrip-fs-rename" role="function"/>ogmrip_fs_rename () -ogmrip_fs_renamegboolean ogmrip_fs_rename (const gchar *old_name, + +ogmrip_fs_rename () +ogmrip_fs_renamegboolean ogmrip_fs_rename (const gchar *old_name, const gchar *new_name, GError **error); diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-lavc-mpeg4.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-lavc-mpeg4.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-lavc-mpeg4.xml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-lavc-mpeg4.xml 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,78 @@ + + + + + +OGMRipLavcMpeg4 +3 +OGMRIP Library + + + +OGMRipLavcMpeg4 + + + + + +Synopsis + + + OGMRipLavcMpeg4; +OGMJobSpawn* ogmrip_lavc_mpeg4_new (OGMDvdTitle *title, + const gchar *output); + + + + + + + + + + + + +Description + + + + + + +Details + +OGMRipLavcMpeg4 +OGMRipLavcMpeg4typedef struct { + OGMRipLavc parent_instance; +} OGMRipLavcMpeg4; + + + + + +ogmrip_lavc_mpeg4_new () +ogmrip_lavc_mpeg4_newOGMJobSpawn* ogmrip_lavc_mpeg4_new (OGMDvdTitle *title, + const gchar *output); + +Creates a new OGMRipLavcMpeg4. + + + +title : + An OGMDvdTitle + +output : + The output file + +Returns : the new OGMRipLavcMpeg4 + + + + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-lavc.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-lavc.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-lavc.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-lavc.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipLavc +OGMRipLavc 3 OGMRIP Library @@ -15,17 +15,12 @@ - + Synopsis - - - OGMRipLavc; enum OGMRipLavcHeaderType; -OGMJobSpawn* ogmrip_lavc_new (OGMDvdTitle *title, - const gchar *output); void ogmrip_lavc_set_cmp (OGMRipLavc *lavc, guint cmp, guint precmp, @@ -43,7 +38,45 @@ void ogmrip_lavc_set_header (OGMRipLavc *lavc, OGMRipLavcHeaderType header); gint ogmrip_lavc_get_header (OGMRipLavc *lavc); - +void ogmrip_lavc_set_buf_size (OGMRipLavc *lavc, + guint buf_size); +gint ogmrip_lavc_get_buf_size (OGMRipLavc *lavc); +void ogmrip_lavc_set_dc (OGMRipLavc *lavc, + guint dc); +gint ogmrip_lavc_get_dc (OGMRipLavc *lavc); +void ogmrip_lavc_set_keyint (OGMRipLavc *lavc, + guint keyint); +gint ogmrip_lavc_get_keyint (OGMRipLavc *lavc); +void ogmrip_lavc_set_last_pred (OGMRipLavc *lavc, + guint last_pred); +gint ogmrip_lavc_get_last_pred (OGMRipLavc *lavc); +void ogmrip_lavc_set_max_rate (OGMRipLavc *lavc, + guint max_rate); +gint ogmrip_lavc_get_max_rate (OGMRipLavc *lavc); +void ogmrip_lavc_set_mbd (OGMRipLavc *lavc, + guint mbd); +gint ogmrip_lavc_get_mbd (OGMRipLavc *lavc); +void ogmrip_lavc_set_min_rate (OGMRipLavc *lavc, + guint min_rate); +gint ogmrip_lavc_get_min_rate (OGMRipLavc *lavc); +void ogmrip_lavc_set_mv0 (OGMRipLavc *lavc, + gboolean mv0); +gboolean ogmrip_lavc_get_mv0 (OGMRipLavc *lavc); +void ogmrip_lavc_set_preme (OGMRipLavc *lavc, + guint preme); +gint ogmrip_lavc_get_preme (OGMRipLavc *lavc); +void ogmrip_lavc_set_qns (OGMRipLavc *lavc, + guint qns); +gint ogmrip_lavc_get_qns (OGMRipLavc *lavc); +void ogmrip_lavc_set_strict (OGMRipLavc *lavc, + guint strict); +gint ogmrip_lavc_get_strict (OGMRipLavc *lavc); +void ogmrip_lavc_set_vb_strategy (OGMRipLavc *lavc, + guint vb_strategy); +gint ogmrip_lavc_get_vb_strategy (OGMRipLavc *lavc); +void ogmrip_lavc_set_vqcomp (OGMRipLavc *lavc, + gdouble vqcomp); +gdouble ogmrip_lavc_get_vqcomp (OGMRipLavc *lavc); @@ -55,19 +88,19 @@ - + Description - + Details - -<anchor id="OGMRipLavc" role="struct"/>OGMRipLavc -OGMRipLavctypedef struct { - OGMRipVideo parent_instance; + +OGMRipLavc +OGMRipLavctypedef struct { + OGMRipVideoCodec parent_instance; OGMRipLavcPriv *priv; } OGMRipLavc; @@ -75,9 +108,9 @@ - -<anchor id="OGMRipLavcHeaderType" role="enum"/>enum OGMRipLavcHeaderType -OGMRipLavcHeaderTypetypedef enum + +enum OGMRipLavcHeaderType +OGMRipLavcHeaderTypetypedef enum { OGMRIP_LAVC_HEADER_AUTO, OGMRIP_LAVC_HEADER_EXTRADATA, @@ -88,27 +121,9 @@ - -<anchor id="ogmrip-lavc-new" role="function"/>ogmrip_lavc_new () -ogmrip_lavc_newOGMJobSpawn* ogmrip_lavc_new (OGMDvdTitle *title, - const gchar *output); - -Creates a new OGMRipLavc - - - -title : - An OGMDvdTitle - -output : - The output file - -Returns : The new OGMRipLavc - - - -<anchor id="ogmrip-lavc-set-cmp" role="function"/>ogmrip_lavc_set_cmp () -ogmrip_lavc_set_cmpvoid ogmrip_lavc_set_cmp (OGMRipLavc *lavc, + +ogmrip_lavc_set_cmp () +ogmrip_lavc_set_cmpvoid ogmrip_lavc_set_cmp (OGMRipLavc *lavc, guint cmp, guint precmp, guint subcmp); @@ -130,9 +145,9 @@ The comparison function for sub pel motion estimation - -<anchor id="ogmrip-lavc-get-cmp" role="function"/>ogmrip_lavc_get_cmp () -ogmrip_lavc_get_cmpvoid ogmrip_lavc_get_cmp (OGMRipLavc *lavc, + +ogmrip_lavc_get_cmp () +ogmrip_lavc_get_cmpvoid ogmrip_lavc_get_cmp (OGMRipLavc *lavc, guint *cmp, guint *precmp, guint *subcmp); @@ -154,9 +169,9 @@ A pointer to store the comparison function for sub pel motion estimation - -<anchor id="ogmrip-lavc-set-dia" role="function"/>ogmrip_lavc_set_dia () -ogmrip_lavc_set_diavoid ogmrip_lavc_set_dia (OGMRipLavc *lavc, + +ogmrip_lavc_set_dia () +ogmrip_lavc_set_diavoid ogmrip_lavc_set_dia (OGMRipLavc *lavc, gint dia, gint predia); @@ -174,9 +189,9 @@ The diamond type and size for motion estimation pre-pass - -<anchor id="ogmrip-lavc-get-dia" role="function"/>ogmrip_lavc_get_dia () -ogmrip_lavc_get_diavoid ogmrip_lavc_get_dia (OGMRipLavc *lavc, + +ogmrip_lavc_get_dia () +ogmrip_lavc_get_diavoid ogmrip_lavc_get_dia (OGMRipLavc *lavc, gint *dia, gint *predia); @@ -194,9 +209,9 @@ A pointer to store the diamond type and size for motion estimation pre-pass - -<anchor id="ogmrip-lavc-set-header" role="function"/>ogmrip_lavc_set_header () -ogmrip_lavc_set_headervoid ogmrip_lavc_set_header (OGMRipLavc *lavc, + +ogmrip_lavc_set_header () +ogmrip_lavc_set_headervoid ogmrip_lavc_set_header (OGMRipLavc *lavc, OGMRipLavcHeaderType header); Sets the global video header type. @@ -210,9 +225,9 @@ The OGMRipLavcHeaderType - -<anchor id="ogmrip-lavc-get-header" role="function"/>ogmrip_lavc_get_header () -ogmrip_lavc_get_headergint ogmrip_lavc_get_header (OGMRipLavc *lavc); + +ogmrip_lavc_get_header () +ogmrip_lavc_get_headergint ogmrip_lavc_get_header (OGMRipLavc *lavc); Gets the global video header type. @@ -224,6 +239,396 @@ Returns : The current OGMRipLavcHeaderType, or -1 + +ogmrip_lavc_set_buf_size () +ogmrip_lavc_set_buf_sizevoid ogmrip_lavc_set_buf_size (OGMRipLavc *lavc, + guint buf_size); + +Sets the buffer size in kb + + + +lavc : + An OGMRipLavc + +buf_size : + A buffer size + + + +ogmrip_lavc_get_buf_size () +ogmrip_lavc_get_buf_sizegint ogmrip_lavc_get_buf_size (OGMRipLavc *lavc); + +Gets the buffer size in kb + + + +lavc : + An OGMRipLavc + +Returns : The buffer size, or -1 + + + +ogmrip_lavc_set_dc () +ogmrip_lavc_set_dcvoid ogmrip_lavc_set_dc (OGMRipLavc *lavc, + guint dc); + +Sets the intra DC precision in bits + + + +lavc : + An OGMRipLavc + +dc : + A precision + + + +ogmrip_lavc_get_dc () +ogmrip_lavc_get_dcgint ogmrip_lavc_get_dc (OGMRipLavc *lavc); + +Gets the intra DC precision in bits + + + +lavc : + An OGMRipLavc + +Returns : The precision, or -1 + + + +ogmrip_lavc_set_keyint () +ogmrip_lavc_set_keyintvoid ogmrip_lavc_set_keyint (OGMRipLavc *lavc, + guint keyint); + +Sets the maximum interval between key frames + + + +lavc : + An OGMRipLavc + +keyint : + An intervale + + + +ogmrip_lavc_get_keyint () +ogmrip_lavc_get_keyintgint ogmrip_lavc_get_keyint (OGMRipLavc *lavc); + +Gets the maximum interval between key frames + + + +lavc : + An OGMRipLavc + +Returns : The interval, or -1 + + + +ogmrip_lavc_set_last_pred () +ogmrip_lavc_set_last_predvoid ogmrip_lavc_set_last_pred (OGMRipLavc *lavc, + guint last_pred); + +Sets the amount of motion predictors from the previous frame + + + +lavc : + An OGMRipLavc + +last_pred : + The last_pred + + + +ogmrip_lavc_get_last_pred () +ogmrip_lavc_get_last_predgint ogmrip_lavc_get_last_pred (OGMRipLavc *lavc); + +Gets the amount of motion predictors from the previous frame + + + +lavc : + An OGMRipLavc + +Returns : The amount, or -1 + + + +ogmrip_lavc_set_max_rate () +ogmrip_lavc_set_max_ratevoid ogmrip_lavc_set_max_rate (OGMRipLavc *lavc, + guint max_rate); + +Sets the maximum bitrate in kbps + + + +lavc : + An OGMRipLavc + +max_rate : + A bitrate + + + +ogmrip_lavc_get_max_rate () +ogmrip_lavc_get_max_rategint ogmrip_lavc_get_max_rate (OGMRipLavc *lavc); + +Gets the maximum bitrate in kbps + + + +lavc : + An OGMRipLavc + +Returns : The bitrate, or -1 + + + +ogmrip_lavc_set_mbd () +ogmrip_lavc_set_mbdvoid ogmrip_lavc_set_mbd (OGMRipLavc *lavc, + guint mbd); + +Sets the macroblock decision algorithm + + + +lavc : + An OGMRipLavc + +mbd : + The mbd + + + +ogmrip_lavc_get_mbd () +ogmrip_lavc_get_mbdgint ogmrip_lavc_get_mbd (OGMRipLavc *lavc); + +Gets the macroblock decision algorithm + + + +lavc : + An OGMRipLavc + +Returns : The algorithm, or -1 + + + +ogmrip_lavc_set_min_rate () +ogmrip_lavc_set_min_ratevoid ogmrip_lavc_set_min_rate (OGMRipLavc *lavc, + guint min_rate); + +Sets the minimum bitrate in kbps + + + +lavc : + An OGMRipLavc + +min_rate : + A bitrate + + + +ogmrip_lavc_get_min_rate () +ogmrip_lavc_get_min_rategint ogmrip_lavc_get_min_rate (OGMRipLavc *lavc); + +Gets the minimum bitrate in kbps + + + +lavc : + An OGMRipLavc + +Returns : The bitrate, or -1 + + + +ogmrip_lavc_set_mv0 () +ogmrip_lavc_set_mv0void ogmrip_lavc_set_mv0 (OGMRipLavc *lavc, + gboolean mv0); + +Try to encode each MB with MV=<0,0> + + + +lavc : + An OGMRipLavc + +mv0 : + TRUE to enable mv0 + + + +ogmrip_lavc_get_mv0 () +ogmrip_lavc_get_mv0gboolean ogmrip_lavc_get_mv0 (OGMRipLavc *lavc); + +Gets whether to try to encode each MB with MV=<0,0> + + + +lavc : + An OGMRipLavc + +Returns : TRUE if mv0 is enabled + + + +ogmrip_lavc_set_preme () +ogmrip_lavc_set_premevoid ogmrip_lavc_set_preme (OGMRipLavc *lavc, + guint preme); + +Sets the motion estimation pre-pass + + + +lavc : + An OGMRipLavc + +preme : + The estimation + + + +ogmrip_lavc_get_preme () +ogmrip_lavc_get_premegint ogmrip_lavc_get_preme (OGMRipLavc *lavc); + +Gets the motion estimation pre-pass + + + +lavc : + An OGMRipLavc + +Returns : The estimation, or -1 + + + +ogmrip_lavc_set_qns () +ogmrip_lavc_set_qnsvoid ogmrip_lavc_set_qns (OGMRipLavc *lavc, + guint qns); + +Sets the quantizer noise shaping + + + +lavc : + An OGMRipLavc + +qns : + The shaping + + + +ogmrip_lavc_get_qns () +ogmrip_lavc_get_qnsgint ogmrip_lavc_get_qns (OGMRipLavc *lavc); + +Gets the quantizer noise shaping + + + +lavc : + An OGMRipLavc + +Returns : The shaping, or -1 + + + +ogmrip_lavc_set_strict () +ogmrip_lavc_set_strictvoid ogmrip_lavc_set_strict (OGMRipLavc *lavc, + guint strict); + +Sets the strict standard compliancy + + + +lavc : + An OGMRipLavc + +strict : + The strictness + + + +ogmrip_lavc_get_strict () +ogmrip_lavc_get_strictgint ogmrip_lavc_get_strict (OGMRipLavc *lavc); + +Gets the strict standard compliancy + + + +lavc : + An OGMRipLavc + +Returns : The strictness, or -1 + + + +ogmrip_lavc_set_vb_strategy () +ogmrip_lavc_set_vb_strategyvoid ogmrip_lavc_set_vb_strategy (OGMRipLavc *lavc, + guint vb_strategy); + +Sets the strategy to choose between I/P/B-frames + + + +lavc : + An OGMRipLavc + +vb_strategy : + A strategy + + + +ogmrip_lavc_get_vb_strategy () +ogmrip_lavc_get_vb_strategygint ogmrip_lavc_get_vb_strategy (OGMRipLavc *lavc); + +Gets the strategy to choose between I/P/B-frames + + + +lavc : + An OGMRipLavc + +Returns : The strategy, or -1 + + + +ogmrip_lavc_set_vqcomp () +ogmrip_lavc_set_vqcompvoid ogmrip_lavc_set_vqcomp (OGMRipLavc *lavc, + gdouble vqcomp); + +Sets the quantizer compression + + + +lavc : + An OGMRipLavc + +vqcomp : + The vqcomp + + + +ogmrip_lavc_get_vqcomp () +ogmrip_lavc_get_vqcompgdouble ogmrip_lavc_get_vqcomp (OGMRipLavc *lavc); + +Gets the quantizer compression + + + +lavc : + An OGMRipLavc + +Returns : The compression, or -1 + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-mkv.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-mkv.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-mkv.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-mkv.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipMatroska +OGMRipMatroska 3 OGMRIP Library @@ -15,16 +15,12 @@ - + Synopsis - - - OGMRipMatroska; OGMJobSpawn* ogmrip_matroska_new (const gchar *output); - @@ -36,27 +32,27 @@ - + Description - + Details - -<anchor id="OGMRipMatroska" role="struct"/>OGMRipMatroska -OGMRipMatroskatypedef struct { + +OGMRipMatroska +OGMRipMatroskatypedef struct { OGMRipContainer parent_instance; } OGMRipMatroska; - -<anchor id="ogmrip-matroska-new" role="function"/>ogmrip_matroska_new () -ogmrip_matroska_newOGMJobSpawn* ogmrip_matroska_new (const gchar *output); + +ogmrip_matroska_new () +ogmrip_matroska_newOGMJobSpawn* ogmrip_matroska_new (const gchar *output); Creates a new OGMRipMatroska. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-mov.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-mov.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-mov.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-mov.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipMov +OGMRipMov 3 OGMRIP Library @@ -15,16 +15,12 @@ - + Synopsis - - - OGMRipMov; OGMJobSpawn* ogmrip_mov_new (const gchar *output); - @@ -36,27 +32,27 @@ - + Description - + Details - -<anchor id="OGMRipMov" role="struct"/>OGMRipMov -OGMRipMovtypedef struct { + +OGMRipMov +OGMRipMovtypedef struct { OGMRipContainer parent_instance; } OGMRipMov; - -<anchor id="ogmrip-mov-new" role="function"/>ogmrip_mov_new () -ogmrip_mov_newOGMJobSpawn* ogmrip_mov_new (const gchar *output); + +ogmrip_mov_new () +ogmrip_mov_newOGMJobSpawn* ogmrip_mov_new (const gchar *output); Creates a new OGMRipMov diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-mp3.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-mp3.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-mp3.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-mp3.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipMp3 +OGMRipMp3 3 OGMRIP Library @@ -15,17 +15,13 @@ - + Synopsis - - - OGMRipMp3; OGMJobSpawn* ogmrip_mp3_new (OGMDvdAudioStream *audio, const gchar *output); - @@ -37,29 +33,27 @@ - + Description - + Details - -<anchor id="OGMRipMp3" role="struct"/>OGMRipMp3 -OGMRipMp3typedef struct { - OGMRipAudio parent_instance; - - OGMRipMp3Priv *priv; + +OGMRipMp3 +OGMRipMp3typedef struct { + OGMRipAudioCodec parent_instance; } OGMRipMp3; - -<anchor id="ogmrip-mp3-new" role="function"/>ogmrip_mp3_new () -ogmrip_mp3_newOGMJobSpawn* ogmrip_mp3_new (OGMDvdAudioStream *audio, + +ogmrip_mp3_new () +ogmrip_mp3_newOGMJobSpawn* ogmrip_mp3_new (OGMDvdAudioStream *audio, const gchar *output); Creates a new OGMRipMp3. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-mp4.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-mp4.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-mp4.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-mp4.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipMp4 +OGMRipMp4 3 OGMRIP Library @@ -15,16 +15,12 @@ - + Synopsis - - - OGMRipMp4; OGMJobSpawn* ogmrip_mp4_new (const gchar *output); - @@ -36,27 +32,29 @@ - + Description - + Details - -<anchor id="OGMRipMp4" role="struct"/>OGMRipMp4 -OGMRipMp4typedef struct { + +OGMRipMp4 +OGMRipMp4typedef struct { OGMRipContainer parent_instance; + + OGMRipMp4Priv *priv; } OGMRipMp4; - -<anchor id="ogmrip-mp4-new" role="function"/>ogmrip_mp4_new () -ogmrip_mp4_newOGMJobSpawn* ogmrip_mp4_new (const gchar *output); + +ogmrip_mp4_new () +ogmrip_mp4_newOGMJobSpawn* ogmrip_mp4_new (const gchar *output); Creates a new OGMRipMp4. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-mplayer.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-mplayer.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-mplayer.xml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-mplayer.xml 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,314 @@ + + + + + +Mplayer +3 +OGMRIP Library + + + +Mplayer +Common wrapper functions for mplayer and mencoder + + + + +Synopsis + + + +#include <ogmrip-mplayer.h> + +GPtrArray* ogmrip_mencoder_audio_command (OGMRipAudioCodec *audio, + const gchar *output); +gdouble ogmrip_mencoder_codec_watch (OGMJobExec *exec, + const gchar *buffer, + OGMRipCodec *codec); +GPtrArray* ogmrip_mencoder_container_command (OGMRipContainer *container); +gdouble ogmrip_mencoder_container_watch (OGMJobExec *exec, + const gchar *buffer, + OGMRipContainer *container); +GPtrArray* ogmrip_mencoder_video_command (OGMRipVideoCodec *video, + const gchar *output, + guint pass); +GPtrArray* ogmrip_mencoder_vobsub_command (OGMRipSubpCodec *subp, + const gchar *output); +gdouble ogmrip_mencoder_vobsub_watch (OGMJobExec *exec, + const gchar *buffer, + OGMRipSubpCodec *subp); +GPtrArray* ogmrip_mplayer_video_command (OGMRipVideoCodec *video, + const gchar *output); +gdouble ogmrip_mplayer_video_watch (OGMJobExec *exec, + const gchar *buffer, + OGMRipVideoCodec *video); +GPtrArray* ogmrip_mplayer_wav_command (OGMRipAudioCodec *audio, + gboolean header, + const gchar *output); +gdouble ogmrip_mplayer_wav_watch (OGMJobExec *exec, + const gchar *buffer, + OGMRipAudioCodec *audio); + + + + + + + + + + + + +Description + + + + + + + + +Details + +ogmrip_mencoder_audio_command () +ogmrip_mencoder_audio_commandGPtrArray* ogmrip_mencoder_audio_command (OGMRipAudioCodec *audio, + const gchar *output); + +This function creates the common part of the command line when using mencoder +to encode an audio stream. + + + +audio : + An OGMRipAudioCodec + +output : + The output file, or NULL + +Returns : A new GPtrArray, or NULL + + + +ogmrip_mencoder_codec_watch () +ogmrip_mencoder_codec_watchgdouble ogmrip_mencoder_codec_watch (OGMJobExec *exec, + const gchar *buffer, + OGMRipCodec *codec); + +This function parses the output of mencoder when encoding a stream and +returns the progress made. + + + +exec : + An OGMJobExec + +buffer : + The buffer to parse + +codec : + An OGMRipCodec + +Returns : The progress made, or -1.0 + + + +ogmrip_mencoder_container_command () +ogmrip_mencoder_container_commandGPtrArray* ogmrip_mencoder_container_command (OGMRipContainer *container); + +This function creates the common part of the command line to merge streams +using mencoder. + + + +container : + An OGMRipContainer + +Returns : A new GPtrArray, or NULL + + + +ogmrip_mencoder_container_watch () +ogmrip_mencoder_container_watchgdouble ogmrip_mencoder_container_watch (OGMJobExec *exec, + const gchar *buffer, + OGMRipContainer *container); + +This function parses the output of mencoder when merging streams and returns +the progress made. + + + +exec : + An OGMJobExec + +buffer : + The buffer to parse + +container : + An OGMRipContainer + +Returns : The progress made, or -1.0 + + + +ogmrip_mencoder_video_command () +ogmrip_mencoder_video_commandGPtrArray* ogmrip_mencoder_video_command (OGMRipVideoCodec *video, + const gchar *output, + guint pass); + +This function creates the common part of the command line when using mencoder +to encode a video stream. + + + +video : + An OGMRipVideoCodec + +output : + The output file, or NULL + +pass : + The number of passes + +Returns : A new GPtrArray, or NULL + + + +ogmrip_mencoder_vobsub_command () +ogmrip_mencoder_vobsub_commandGPtrArray* ogmrip_mencoder_vobsub_command (OGMRipSubpCodec *subp, + const gchar *output); + +This function creates the command line for extracting VobSub subtitles +using mencoder. + + + +subp : + An OGMRipSubpCodec + +output : + The output file, or NULL + +Returns : A new GPtrArray, or NULL + + + +ogmrip_mencoder_vobsub_watch () +ogmrip_mencoder_vobsub_watchgdouble ogmrip_mencoder_vobsub_watch (OGMJobExec *exec, + const gchar *buffer, + OGMRipSubpCodec *subp); + +This function parses the output of mencoder when extracting VobSub subtitles +and returns the progress made. + + + +exec : + An OGMJobExec + +buffer : + The buffer to parse + +subp : + An OGMRipSubpCodec + +Returns : The progress made, or -1.0 + + + +ogmrip_mplayer_video_command () +ogmrip_mplayer_video_commandGPtrArray* ogmrip_mplayer_video_command (OGMRipVideoCodec *video, + const gchar *output); + +This function creates the common part of the command line when using mplayer +to encode a video stream. + + + +video : + An OGMRipVideoCodec + +output : + The output file, or NULL + +Returns : A new GPtrArray, or NULL + + + +ogmrip_mplayer_video_watch () +ogmrip_mplayer_video_watchgdouble ogmrip_mplayer_video_watch (OGMJobExec *exec, + const gchar *buffer, + OGMRipVideoCodec *video); + +This function parses the output of mplayer when encoding a video stream and +returns the progress made. + + + +exec : + An OGMJobExec + +buffer : + The buffer to parse + +video : + An OGMRipVideoCodec + +Returns : The progress made, or -1.0 + + + +ogmrip_mplayer_wav_command () +ogmrip_mplayer_wav_commandGPtrArray* ogmrip_mplayer_wav_command (OGMRipAudioCodec *audio, + gboolean header, + const gchar *output); + +This function creates the command line for encoding an audio stream in PCM +or WAV. + + + +audio : + An OGMRipAudioCodec + +header : + Whether to add the PCM header + +output : + The output file, or NULL + +Returns : A new GPtrArray, or NULL + + + +ogmrip_mplayer_wav_watch () +ogmrip_mplayer_wav_watchgdouble ogmrip_mplayer_wav_watch (OGMJobExec *exec, + const gchar *buffer, + OGMRipAudioCodec *audio); + +This function parses the output of mplayer when encoding an audio stream in +WAV or PCM and returns the progress made. + + + +exec : + An OGMJobExec + +buffer : + The buffer to parse + +audio : + An OGMRipAudioCodec + +Returns : The progress made, or -1.0 + + + + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-ogg.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-ogg.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-ogg.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-ogg.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipOgg +OGMRipOgg 3 OGMRIP Library @@ -15,16 +15,12 @@ - + Synopsis - - - OGMRipOgg; OGMJobSpawn* ogmrip_ogg_new (const gchar *output); - @@ -36,29 +32,27 @@ - + Description - + Details - -<anchor id="OGMRipOgg" role="struct"/>OGMRipOgg -OGMRipOggtypedef struct { + +OGMRipOgg +OGMRipOggtypedef struct { OGMRipContainer parent_instance; - - OGMRipOggPriv *priv; } OGMRipOgg; - -<anchor id="ogmrip-ogg-new" role="function"/>ogmrip_ogg_new () -ogmrip_ogg_newOGMJobSpawn* ogmrip_ogg_new (const gchar *output); + +ogmrip_ogg_new () +ogmrip_ogg_newOGMJobSpawn* ogmrip_ogg_new (const gchar *output); Creates a new OGMRipOgg. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-plugin.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-plugin.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-plugin.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-plugin.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -Plugins System +Plugins System 3 OGMRIP Library @@ -15,18 +15,17 @@ - + Synopsis #include <ogmrip-plugin.h> - - OGMRipPluginVideoCodec; - OGMRipPluginAudioCodec; - OGMRipPluginSubpCodec; - OGMRipPluginContainer; + OGMRipVideoPlugin; + OGMRipAudioPlugin; + OGMRipSubpPlugin; + OGMRipContainerPlugin; void (*OGMRipPluginFunc) (GType type, const gchar *name, const gchar *description, @@ -50,6 +49,7 @@ (GType container); gint ogmrip_plugin_get_container_max_subp (GType container); +GType ogmrip_plugin_get_container_by_name (const gchar *name); gint ogmrip_plugin_get_n_video_codecs (void); void ogmrip_plugin_foreach_video_codec (OGMRipPluginFunc func, gpointer data); @@ -64,6 +64,8 @@ (GType codec); gint ogmrip_plugin_get_video_codec_threads (GType codec); +GType ogmrip_plugin_get_video_codec_by_name + (const gchar *name); gint ogmrip_plugin_get_n_audio_codecs (void); void ogmrip_plugin_foreach_audio_codec (OGMRipPluginFunc func, gpointer data); @@ -74,6 +76,8 @@ gint ogmrip_plugin_get_audio_codec_index (GType codec); gint ogmrip_plugin_get_audio_codec_format (GType codec); +GType ogmrip_plugin_get_audio_codec_by_name + (const gchar *name); gint ogmrip_plugin_get_n_subp_codecs (void); void ogmrip_plugin_foreach_subp_codec (OGMRipPluginFunc func, gpointer data); @@ -84,6 +88,8 @@ gint ogmrip_plugin_get_subp_codec_index (GType codec); gint ogmrip_plugin_get_subp_codec_format (GType codec); gboolean ogmrip_plugin_get_subp_codec_text (GType codec); +GType ogmrip_plugin_get_subp_codec_by_name + (const gchar *name); gboolean ogmrip_plugin_can_contain_video (GType container, GType codec); gboolean ogmrip_plugin_can_contain_audio (GType container, @@ -107,7 +113,7 @@ - + Description @@ -116,11 +122,11 @@ - + Details - -<anchor id="OGMRipPluginVideoCodec" role="struct"/>OGMRipPluginVideoCodec -OGMRipPluginVideoCodectypedef struct { + +OGMRipVideoPlugin +OGMRipVideoPlugintypedef struct { GModule *module; GType type; gchar *name; @@ -128,7 +134,7 @@ OGMRipFormatType format; gint passes; gint threads; -} OGMRipPluginVideoCodec; +} OGMRipVideoPlugin; A structure describing a video codec plugin @@ -171,15 +177,15 @@ - -<anchor id="OGMRipPluginAudioCodec" role="struct"/>OGMRipPluginAudioCodec -OGMRipPluginAudioCodectypedef struct { + +OGMRipAudioPlugin +OGMRipAudioPlugintypedef struct { GModule *module; GType type; gchar *name; gchar *description; OGMRipFormatType format; -} OGMRipPluginAudioCodec; +} OGMRipAudioPlugin; A structure describing an audio codec plugin @@ -212,16 +218,16 @@ - -<anchor id="OGMRipPluginSubpCodec" role="struct"/>OGMRipPluginSubpCodec -OGMRipPluginSubpCodectypedef struct { + +OGMRipSubpPlugin +OGMRipSubpPlugintypedef struct { GModule *module; GType type; gchar *name; gchar *description; OGMRipFormatType format; gboolean text; -} OGMRipPluginSubpCodec; +} OGMRipSubpPlugin; A structure describing a subtitle codec plugin @@ -259,9 +265,9 @@ - -<anchor id="OGMRipPluginContainer" role="struct"/>OGMRipPluginContainer -OGMRipPluginContainertypedef struct { + +OGMRipContainerPlugin +OGMRipContainerPlugintypedef struct { GModule *module; GType type; gchar *name; @@ -270,7 +276,7 @@ gint max_audio; gint max_subp; gint *formats; -} OGMRipPluginContainer; +} OGMRipContainerPlugin; A structure describing a container plugin @@ -318,9 +324,9 @@ - -<anchor id="OGMRipPluginFunc" role="function"/>OGMRipPluginFunc () -OGMRipPluginFuncvoid (*OGMRipPluginFunc) (GType type, + +OGMRipPluginFunc () +OGMRipPluginFuncvoid (*OGMRipPluginFunc) (GType type, const gchar *name, const gchar *description, gpointer data); @@ -344,9 +350,9 @@ The user data - -<anchor id="OGMRipPluginCmpFunc" role="function"/>OGMRipPluginCmpFunc () -OGMRipPluginCmpFuncgint (*OGMRipPluginCmpFunc) (GType type, + +OGMRipPluginCmpFunc () +OGMRipPluginCmpFuncgint (*OGMRipPluginCmpFunc) (GType type, const gchar *name, const gchar *description, gconstpointer data); @@ -372,25 +378,25 @@ Returns : 0 when the expected plugin is found - -<anchor id="ogmrip-plugin-init" role="function"/>ogmrip_plugin_init () -ogmrip_plugin_initvoid ogmrip_plugin_init (void); + +ogmrip_plugin_init () +ogmrip_plugin_initvoid ogmrip_plugin_init (void); Initializes the plugin system. - -<anchor id="ogmrip-plugin-uninit" role="function"/>ogmrip_plugin_uninit () -ogmrip_plugin_uninitvoid ogmrip_plugin_uninit (void); + +ogmrip_plugin_uninit () +ogmrip_plugin_uninitvoid ogmrip_plugin_uninit (void); Uninitializes the plugin system. - -<anchor id="ogmrip-plugin-get-n-containers" role="function"/>ogmrip_plugin_get_n_containers () -ogmrip_plugin_get_n_containersgint ogmrip_plugin_get_n_containers (void); + +ogmrip_plugin_get_n_containers () +ogmrip_plugin_get_n_containersgint ogmrip_plugin_get_n_containers (void); Gets the number of container plugins. @@ -399,9 +405,9 @@ Returns : the number of container plugins - -<anchor id="ogmrip-plugin-foreach-container" role="function"/>ogmrip_plugin_foreach_container () -ogmrip_plugin_foreach_containervoid ogmrip_plugin_foreach_container (OGMRipPluginFunc func, + +ogmrip_plugin_foreach_container () +ogmrip_plugin_foreach_containervoid ogmrip_plugin_foreach_container (OGMRipPluginFunc func, gpointer data); Calls a function for each container plugin. @@ -415,9 +421,9 @@ User data to pass to the function - -<anchor id="ogmrip-plugin-find-container" role="function"/>ogmrip_plugin_find_container () -ogmrip_plugin_find_containerGType ogmrip_plugin_find_container (OGMRipPluginCmpFunc func, + +ogmrip_plugin_find_container () +ogmrip_plugin_find_containerGType ogmrip_plugin_find_container (OGMRipPluginCmpFunc func, gconstpointer data); Finds a container using the supplied function. @@ -434,9 +440,9 @@ Returns : The type of the container, or G_TYPE_NONE - -<anchor id="ogmrip-plugin-get-nth-container" role="function"/>ogmrip_plugin_get_nth_container () -ogmrip_plugin_get_nth_containerGType ogmrip_plugin_get_nth_container (guint n); + +ogmrip_plugin_get_nth_container () +ogmrip_plugin_get_nth_containerGType ogmrip_plugin_get_nth_container (guint n); Gets the container at the given position. @@ -448,9 +454,9 @@ Returns : The type of the container, or G_TYPE_NONE - -<anchor id="ogmrip-plugin-get-container-name" role="function"/>ogmrip_plugin_get_container_name () -ogmrip_plugin_get_container_namegchar* ogmrip_plugin_get_container_name (GType container); + +ogmrip_plugin_get_container_name () +ogmrip_plugin_get_container_namegchar* ogmrip_plugin_get_container_name (GType container); Gets the name of the given container. @@ -462,9 +468,9 @@ Returns : The name of the container, or NULL - -<anchor id="ogmrip-plugin-get-container-index" role="function"/>ogmrip_plugin_get_container_index () -ogmrip_plugin_get_container_indexgint ogmrip_plugin_get_container_index (GType container); + +ogmrip_plugin_get_container_index () +ogmrip_plugin_get_container_indexgint ogmrip_plugin_get_container_index (GType container); Gets the position of the given container. @@ -476,9 +482,9 @@ Returns : The index of the container, or -1 - -<anchor id="ogmrip-plugin-get-container-bframes" role="function"/>ogmrip_plugin_get_container_bframes () -ogmrip_plugin_get_container_bframesgboolean ogmrip_plugin_get_container_bframes (GType container); + +ogmrip_plugin_get_container_bframes () +ogmrip_plugin_get_container_bframesgboolean ogmrip_plugin_get_container_bframes (GType container); Gets whether the given container supports B-frames @@ -490,9 +496,9 @@ Returns : TRUE if the container supports B-frames - -<anchor id="ogmrip-plugin-get-container-max-audio" role="function"/>ogmrip_plugin_get_container_max_audio () -ogmrip_plugin_get_container_max_audiogint ogmrip_plugin_get_container_max_audio + +ogmrip_plugin_get_container_max_audio () +ogmrip_plugin_get_container_max_audiogint ogmrip_plugin_get_container_max_audio (GType container); Returns the number of audio streams the given container can contain. @@ -505,9 +511,9 @@ Returns : the number of audio streams, or -1 - -<anchor id="ogmrip-plugin-get-container-max-subp" role="function"/>ogmrip_plugin_get_container_max_subp () -ogmrip_plugin_get_container_max_subpgint ogmrip_plugin_get_container_max_subp + +ogmrip_plugin_get_container_max_subp () +ogmrip_plugin_get_container_max_subpgint ogmrip_plugin_get_container_max_subp (GType container); Returns the number of subtitle streams the given container can contain. @@ -520,9 +526,23 @@ Returns : the number of subtitle streams, or -1 - -<anchor id="ogmrip-plugin-get-n-video-codecs" role="function"/>ogmrip_plugin_get_n_video_codecs () -ogmrip_plugin_get_n_video_codecsgint ogmrip_plugin_get_n_video_codecs (void); + +ogmrip_plugin_get_container_by_name () +ogmrip_plugin_get_container_by_nameGType ogmrip_plugin_get_container_by_name (const gchar *name); + +Gets the container with the given name. + + + +name : + The name of the container + +Returns : The type of the container, or G_TYPE_NONE + + + +ogmrip_plugin_get_n_video_codecs () +ogmrip_plugin_get_n_video_codecsgint ogmrip_plugin_get_n_video_codecs (void); Gets the number of video codec plugins. @@ -531,9 +551,9 @@ Returns : the number of video codec plugins - -<anchor id="ogmrip-plugin-foreach-video-codec" role="function"/>ogmrip_plugin_foreach_video_codec () -ogmrip_plugin_foreach_video_codecvoid ogmrip_plugin_foreach_video_codec (OGMRipPluginFunc func, + +ogmrip_plugin_foreach_video_codec () +ogmrip_plugin_foreach_video_codecvoid ogmrip_plugin_foreach_video_codec (OGMRipPluginFunc func, gpointer data); Calls a function for each video codec plugin. @@ -547,9 +567,9 @@ User data to pass to the function - -<anchor id="ogmrip-plugin-find-video-codec" role="function"/>ogmrip_plugin_find_video_codec () -ogmrip_plugin_find_video_codecGType ogmrip_plugin_find_video_codec (OGMRipPluginCmpFunc func, + +ogmrip_plugin_find_video_codec () +ogmrip_plugin_find_video_codecGType ogmrip_plugin_find_video_codec (OGMRipPluginCmpFunc func, gconstpointer data); Finds a video codec using the supplied function. @@ -566,9 +586,9 @@ Returns : The type of the video codec, or G_TYPE_NONE - -<anchor id="ogmrip-plugin-get-nth-video-codec" role="function"/>ogmrip_plugin_get_nth_video_codec () -ogmrip_plugin_get_nth_video_codecGType ogmrip_plugin_get_nth_video_codec (guint n); + +ogmrip_plugin_get_nth_video_codec () +ogmrip_plugin_get_nth_video_codecGType ogmrip_plugin_get_nth_video_codec (guint n); Gets the video codec at the given position. @@ -580,9 +600,9 @@ Returns : The type of the video codec, or G_TYPE_NONE - -<anchor id="ogmrip-plugin-get-video-codec-name" role="function"/>ogmrip_plugin_get_video_codec_name () -ogmrip_plugin_get_video_codec_namegchar* ogmrip_plugin_get_video_codec_name (GType codec); + +ogmrip_plugin_get_video_codec_name () +ogmrip_plugin_get_video_codec_namegchar* ogmrip_plugin_get_video_codec_name (GType codec); Gets the name of the given video codec. @@ -594,9 +614,9 @@ Returns : The name of the video codec, or NULL - -<anchor id="ogmrip-plugin-get-video-codec-index" role="function"/>ogmrip_plugin_get_video_codec_index () -ogmrip_plugin_get_video_codec_indexgint ogmrip_plugin_get_video_codec_index (GType codec); + +ogmrip_plugin_get_video_codec_index () +ogmrip_plugin_get_video_codec_indexgint ogmrip_plugin_get_video_codec_index (GType codec); Gets the position of the given video codec. @@ -608,9 +628,9 @@ Returns : The index of the video codec, or -1 - -<anchor id="ogmrip-plugin-get-video-codec-format" role="function"/>ogmrip_plugin_get_video_codec_format () -ogmrip_plugin_get_video_codec_formatgint ogmrip_plugin_get_video_codec_format + +ogmrip_plugin_get_video_codec_format () +ogmrip_plugin_get_video_codec_formatgint ogmrip_plugin_get_video_codec_format (GType codec); Gets the format of the given video codec. @@ -623,9 +643,9 @@ Returns : The format of the video codec, or NULL - -<anchor id="ogmrip-plugin-get-video-codec-passes" role="function"/>ogmrip_plugin_get_video_codec_passes () -ogmrip_plugin_get_video_codec_passesgint ogmrip_plugin_get_video_codec_passes + +ogmrip_plugin_get_video_codec_passes () +ogmrip_plugin_get_video_codec_passesgint ogmrip_plugin_get_video_codec_passes (GType codec); Gets the maximum number of passes the given video codec supports. @@ -638,9 +658,9 @@ Returns : The maximum number of passes, or -1 - -<anchor id="ogmrip-plugin-get-video-codec-threads" role="function"/>ogmrip_plugin_get_video_codec_threads () -ogmrip_plugin_get_video_codec_threadsgint ogmrip_plugin_get_video_codec_threads + +ogmrip_plugin_get_video_codec_threads () +ogmrip_plugin_get_video_codec_threadsgint ogmrip_plugin_get_video_codec_threads (GType codec); Gets the maximum number of threads the given video codec supports. @@ -653,9 +673,24 @@ Returns : The maximum number of threads, or -1 - -<anchor id="ogmrip-plugin-get-n-audio-codecs" role="function"/>ogmrip_plugin_get_n_audio_codecs () -ogmrip_plugin_get_n_audio_codecsgint ogmrip_plugin_get_n_audio_codecs (void); + +ogmrip_plugin_get_video_codec_by_name () +ogmrip_plugin_get_video_codec_by_nameGType ogmrip_plugin_get_video_codec_by_name + (const gchar *name); + +Gets the video codec with the given name. + + + +name : + The name of the video codec + +Returns : The type of the video codec, or G_TYPE_NONE + + + +ogmrip_plugin_get_n_audio_codecs () +ogmrip_plugin_get_n_audio_codecsgint ogmrip_plugin_get_n_audio_codecs (void); Gets the number of audio codec plugins. @@ -664,9 +699,9 @@ Returns : the number of audio codec plugins - -<anchor id="ogmrip-plugin-foreach-audio-codec" role="function"/>ogmrip_plugin_foreach_audio_codec () -ogmrip_plugin_foreach_audio_codecvoid ogmrip_plugin_foreach_audio_codec (OGMRipPluginFunc func, + +ogmrip_plugin_foreach_audio_codec () +ogmrip_plugin_foreach_audio_codecvoid ogmrip_plugin_foreach_audio_codec (OGMRipPluginFunc func, gpointer data); Calls a function for each plugin. @@ -680,9 +715,9 @@ User data to pass to the function - -<anchor id="ogmrip-plugin-find-audio-codec" role="function"/>ogmrip_plugin_find_audio_codec () -ogmrip_plugin_find_audio_codecGType ogmrip_plugin_find_audio_codec (OGMRipPluginCmpFunc func, + +ogmrip_plugin_find_audio_codec () +ogmrip_plugin_find_audio_codecGType ogmrip_plugin_find_audio_codec (OGMRipPluginCmpFunc func, gconstpointer data); Finds a audio codec using the supplied function. @@ -699,9 +734,9 @@ Returns : The type of the audio codec, or G_TYPE_NONE - -<anchor id="ogmrip-plugin-get-nth-audio-codec" role="function"/>ogmrip_plugin_get_nth_audio_codec () -ogmrip_plugin_get_nth_audio_codecGType ogmrip_plugin_get_nth_audio_codec (guint n); + +ogmrip_plugin_get_nth_audio_codec () +ogmrip_plugin_get_nth_audio_codecGType ogmrip_plugin_get_nth_audio_codec (guint n); Gets the audio codec at the given position. @@ -713,9 +748,9 @@ Returns : The type of the audio codec, or G_TYPE_NONE - -<anchor id="ogmrip-plugin-get-audio-codec-name" role="function"/>ogmrip_plugin_get_audio_codec_name () -ogmrip_plugin_get_audio_codec_namegchar* ogmrip_plugin_get_audio_codec_name (GType codec); + +ogmrip_plugin_get_audio_codec_name () +ogmrip_plugin_get_audio_codec_namegchar* ogmrip_plugin_get_audio_codec_name (GType codec); Gets the name of the given audio codec. @@ -727,9 +762,9 @@ Returns : The name of the audio codec, or NULL - -<anchor id="ogmrip-plugin-get-audio-codec-index" role="function"/>ogmrip_plugin_get_audio_codec_index () -ogmrip_plugin_get_audio_codec_indexgint ogmrip_plugin_get_audio_codec_index (GType codec); + +ogmrip_plugin_get_audio_codec_index () +ogmrip_plugin_get_audio_codec_indexgint ogmrip_plugin_get_audio_codec_index (GType codec); Gets the position of the given audio codec. @@ -741,9 +776,9 @@ Returns : The index of the audio codec, or -1 - -<anchor id="ogmrip-plugin-get-audio-codec-format" role="function"/>ogmrip_plugin_get_audio_codec_format () -ogmrip_plugin_get_audio_codec_formatgint ogmrip_plugin_get_audio_codec_format + +ogmrip_plugin_get_audio_codec_format () +ogmrip_plugin_get_audio_codec_formatgint ogmrip_plugin_get_audio_codec_format (GType codec); Gets the format of the given audio codec. @@ -756,9 +791,24 @@ Returns : The format of the audio codec, or NULL - -<anchor id="ogmrip-plugin-get-n-subp-codecs" role="function"/>ogmrip_plugin_get_n_subp_codecs () -ogmrip_plugin_get_n_subp_codecsgint ogmrip_plugin_get_n_subp_codecs (void); + +ogmrip_plugin_get_audio_codec_by_name () +ogmrip_plugin_get_audio_codec_by_nameGType ogmrip_plugin_get_audio_codec_by_name + (const gchar *name); + +Gets the audio codec with the given name. + + + +name : + The name of the audio codec + +Returns : The type of the audio codec, or G_TYPE_NONE + + + +ogmrip_plugin_get_n_subp_codecs () +ogmrip_plugin_get_n_subp_codecsgint ogmrip_plugin_get_n_subp_codecs (void); Gets the number of subtitle codec plugins. @@ -767,9 +817,9 @@ Returns : the number of subtitle codec plugins - -<anchor id="ogmrip-plugin-foreach-subp-codec" role="function"/>ogmrip_plugin_foreach_subp_codec () -ogmrip_plugin_foreach_subp_codecvoid ogmrip_plugin_foreach_subp_codec (OGMRipPluginFunc func, + +ogmrip_plugin_foreach_subp_codec () +ogmrip_plugin_foreach_subp_codecvoid ogmrip_plugin_foreach_subp_codec (OGMRipPluginFunc func, gpointer data); Calls a function for each plugin. @@ -783,9 +833,9 @@ User data to pass to the function - -<anchor id="ogmrip-plugin-find-subp-codec" role="function"/>ogmrip_plugin_find_subp_codec () -ogmrip_plugin_find_subp_codecGType ogmrip_plugin_find_subp_codec (OGMRipPluginCmpFunc func, + +ogmrip_plugin_find_subp_codec () +ogmrip_plugin_find_subp_codecGType ogmrip_plugin_find_subp_codec (OGMRipPluginCmpFunc func, gconstpointer data); Finds a subtitle codec using the supplied function. @@ -802,9 +852,9 @@ Returns : The type of the subtitle codec, or G_TYPE_NONE - -<anchor id="ogmrip-plugin-get-nth-subp-codec" role="function"/>ogmrip_plugin_get_nth_subp_codec () -ogmrip_plugin_get_nth_subp_codecGType ogmrip_plugin_get_nth_subp_codec (guint n); + +ogmrip_plugin_get_nth_subp_codec () +ogmrip_plugin_get_nth_subp_codecGType ogmrip_plugin_get_nth_subp_codec (guint n); Gets the subtitle codec at the given position. @@ -816,9 +866,9 @@ Returns : The type of the subtitle codec, or G_TYPE_NONE - -<anchor id="ogmrip-plugin-get-subp-codec-name" role="function"/>ogmrip_plugin_get_subp_codec_name () -ogmrip_plugin_get_subp_codec_namegchar* ogmrip_plugin_get_subp_codec_name (GType codec); + +ogmrip_plugin_get_subp_codec_name () +ogmrip_plugin_get_subp_codec_namegchar* ogmrip_plugin_get_subp_codec_name (GType codec); Gets the name of the given subtitle codec. @@ -830,9 +880,9 @@ Returns : The name of the subtitle codec, or NULL - -<anchor id="ogmrip-plugin-get-subp-codec-index" role="function"/>ogmrip_plugin_get_subp_codec_index () -ogmrip_plugin_get_subp_codec_indexgint ogmrip_plugin_get_subp_codec_index (GType codec); + +ogmrip_plugin_get_subp_codec_index () +ogmrip_plugin_get_subp_codec_indexgint ogmrip_plugin_get_subp_codec_index (GType codec); Gets the position of the given subtitle codec. @@ -844,9 +894,9 @@ Returns : The index of the subtitle codec, or -1 - -<anchor id="ogmrip-plugin-get-subp-codec-format" role="function"/>ogmrip_plugin_get_subp_codec_format () -ogmrip_plugin_get_subp_codec_formatgint ogmrip_plugin_get_subp_codec_format (GType codec); + +ogmrip_plugin_get_subp_codec_format () +ogmrip_plugin_get_subp_codec_formatgint ogmrip_plugin_get_subp_codec_format (GType codec); Gets the format of the given subtitle codec. @@ -858,9 +908,9 @@ Returns : The format of the subtitle codec, or NULL - -<anchor id="ogmrip-plugin-get-subp-codec-text" role="function"/>ogmrip_plugin_get_subp_codec_text () -ogmrip_plugin_get_subp_codec_textgboolean ogmrip_plugin_get_subp_codec_text (GType codec); + +ogmrip_plugin_get_subp_codec_text () +ogmrip_plugin_get_subp_codec_textgboolean ogmrip_plugin_get_subp_codec_text (GType codec); Gets whether the given codec outputs text subtitles. @@ -872,9 +922,24 @@ Returns : TRUE if the codec output text subtitles - -<anchor id="ogmrip-plugin-can-contain-video" role="function"/>ogmrip_plugin_can_contain_video () -ogmrip_plugin_can_contain_videogboolean ogmrip_plugin_can_contain_video (GType container, + +ogmrip_plugin_get_subp_codec_by_name () +ogmrip_plugin_get_subp_codec_by_nameGType ogmrip_plugin_get_subp_codec_by_name + (const gchar *name); + +Gets the subp codec with the given name. + + + +name : + The name of the subp codec + +Returns : The type of the subp codec, or G_TYPE_NONE + + + +ogmrip_plugin_can_contain_video () +ogmrip_plugin_can_contain_videogboolean ogmrip_plugin_can_contain_video (GType container, GType codec); Returns whether container supports the given video codec. @@ -890,9 +955,9 @@ Returns : TRUE if container supports type - -<anchor id="ogmrip-plugin-can-contain-audio" role="function"/>ogmrip_plugin_can_contain_audio () -ogmrip_plugin_can_contain_audiogboolean ogmrip_plugin_can_contain_audio (GType container, + +ogmrip_plugin_can_contain_audio () +ogmrip_plugin_can_contain_audiogboolean ogmrip_plugin_can_contain_audio (GType container, GType codec); Returns whether container supports the given audio codec. @@ -908,9 +973,9 @@ Returns : TRUE if container supports type - -<anchor id="ogmrip-plugin-can-contain-subp" role="function"/>ogmrip_plugin_can_contain_subp () -ogmrip_plugin_can_contain_subpgboolean ogmrip_plugin_can_contain_subp (GType container, + +ogmrip_plugin_can_contain_subp () +ogmrip_plugin_can_contain_subpgboolean ogmrip_plugin_can_contain_subp (GType container, GType codec); Returns whether container supports the given subtitle codec. @@ -926,9 +991,9 @@ Returns : TRUE if container supports type - -<anchor id="ogmrip-plugin-can-contain-format" role="function"/>ogmrip_plugin_can_contain_format () -ogmrip_plugin_can_contain_formatgboolean ogmrip_plugin_can_contain_format (GType container, + +ogmrip_plugin_can_contain_format () +ogmrip_plugin_can_contain_formatgboolean ogmrip_plugin_can_contain_format (GType container, OGMRipFormatType format); Returns whether container supports the given format. @@ -944,9 +1009,9 @@ Returns : TRUE if container supports format - -<anchor id="ogmrip-plugin-can-contain-n-audio" role="function"/>ogmrip_plugin_can_contain_n_audio () -ogmrip_plugin_can_contain_n_audiogboolean ogmrip_plugin_can_contain_n_audio (GType container, + +ogmrip_plugin_can_contain_n_audio () +ogmrip_plugin_can_contain_n_audiogboolean ogmrip_plugin_can_contain_n_audio (GType container, guint ncodec); Returns whether container can contain ncodec audio streams. @@ -962,9 +1027,9 @@ Returns : TRUE if container can contain ncodec audio streams - -<anchor id="ogmrip-plugin-can-contain-n-subp" role="function"/>ogmrip_plugin_can_contain_n_subp () -ogmrip_plugin_can_contain_n_subpgboolean ogmrip_plugin_can_contain_n_subp (GType container, + +ogmrip_plugin_can_contain_n_subp () +ogmrip_plugin_can_contain_n_subpgboolean ogmrip_plugin_can_contain_n_subp (GType container, guint ncodec); Returns whether container can contain ncodec subtitle streams. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-srt.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-srt.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-srt.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-srt.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipSrt +OGMRipSrt 3 OGMRIP Library @@ -15,17 +15,13 @@ - + Synopsis - - - OGMRipSrt; OGMJobSpawn* ogmrip_srt_new (OGMDvdSubpStream *subp, const gchar *output); - @@ -37,19 +33,19 @@ - + Description - + Details - -<anchor id="OGMRipSrt" role="struct"/>OGMRipSrt -OGMRipSrttypedef struct { - OGMRipSubp parent_instance; + +OGMRipSrt +OGMRipSrttypedef struct { + OGMRipSubpCodec parent_instance; OGMRipSrtPriv *priv; } OGMRipSrt; @@ -57,9 +53,9 @@ - -<anchor id="ogmrip-srt-new" role="function"/>ogmrip_srt_new () -ogmrip_srt_newOGMJobSpawn* ogmrip_srt_new (OGMDvdSubpStream *subp, + +ogmrip_srt_new () +ogmrip_srt_newOGMJobSpawn* ogmrip_srt_new (OGMDvdSubpStream *subp, const gchar *output); Creates a new OGMRipSrt. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-subp-codec.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-subp-codec.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-subp-codec.xml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-subp-codec.xml 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,238 @@ + + + + + +OGMRipSubpCodec +3 +OGMRIP Library + + + +OGMRipSubpCodec +Base class for subtitles codecs + + + + +Synopsis + + + +#include <ogmrip-subp-codec.h> + + OGMRipSubpCodec; +void ogmrip_subp_codec_set_dvd_subp_stream + (OGMRipSubpCodec *subp, + OGMDvdSubpStream *stream); +OGMDvdSubpStream* ogmrip_subp_codec_get_dvd_subp_stream + (OGMRipSubpCodec *subp); +gint ogmrip_subp_codec_get_charset (OGMRipSubpCodec *subp); +void ogmrip_subp_codec_set_charset (OGMRipSubpCodec *subp, + OGMRipCharset charset); +gint ogmrip_subp_codec_get_eol_style (OGMRipSubpCodec *subp); +void ogmrip_subp_codec_set_eol_style (OGMRipSubpCodec *subp, + OGMRipEolStyle eol); +gboolean ogmrip_subp_codec_get_forced_only (OGMRipSubpCodec *subp); +void ogmrip_subp_codec_set_forced_only (OGMRipSubpCodec *subp, + gboolean forced_only); + + + + +Object Hierarchy + + GObject + +----OGMJobSpawn + +----OGMJobContainer + +----OGMJobBin + +----OGMRipCodec + +----OGMRipSubpCodec + + + + + + + + + +Properties + + "charset" guint : Read / Write + "eol" guint : Read / Write + "forced-only" gboolean : Read / Write + "stream" gpointer : Read / Write + + + + + + +Description + + + + + + + + +Details + +OGMRipSubpCodec +OGMRipSubpCodectypedef struct _OGMRipSubpCodec OGMRipSubpCodec; + + + + +ogmrip_subp_codec_set_dvd_subp_stream () +ogmrip_subp_codec_set_dvd_subp_streamvoid ogmrip_subp_codec_set_dvd_subp_stream + (OGMRipSubpCodec *subp, + OGMDvdSubpStream *stream); + +Sets the subtitle stream to encode. + + + +subp : + an OGMRipSubpCodec + +stream : + an OGMDvdSubpStream + + + +ogmrip_subp_codec_get_dvd_subp_stream () +ogmrip_subp_codec_get_dvd_subp_streamOGMDvdSubpStream* ogmrip_subp_codec_get_dvd_subp_stream + (OGMRipSubpCodec *subp); + +Gets the subtitle stream to encode. + + + +subp : + an OGMRipSubpCodec + +Returns : an OGMDvdSubpStream, or NULL + + + +ogmrip_subp_codec_get_charset () +ogmrip_subp_codec_get_charsetgint ogmrip_subp_codec_get_charset (OGMRipSubpCodec *subp); + +Gets the character set of text subtitles + + + +subp : + an OGMRipSubpCodec + +Returns : an OGMRipCharset, or -1 + + + +ogmrip_subp_codec_set_charset () +ogmrip_subp_codec_set_charsetvoid ogmrip_subp_codec_set_charset (OGMRipSubpCodec *subp, + OGMRipCharset charset); + +Sets the character set of text subtitles + + + +subp : + an OGMRipSubpCodec + +charset : + the OGMRipCharset + + + +ogmrip_subp_codec_get_eol_style () +ogmrip_subp_codec_get_eol_stylegint ogmrip_subp_codec_get_eol_style (OGMRipSubpCodec *subp); + +Gets the end-of-line characters of text subtitles + + + +subp : + an OGMRipSubpCodec + +Returns : the OGMRipEolStyle, or -1 + + + +ogmrip_subp_codec_set_eol_style () +ogmrip_subp_codec_set_eol_stylevoid ogmrip_subp_codec_set_eol_style (OGMRipSubpCodec *subp, + OGMRipEolStyle eol); + +Sets the end-of-line characters of text subtitles + + + +subp : + an OGMRipSubpCodec + +eol : + the OGMRipEolStyle + + + +ogmrip_subp_codec_get_forced_only () +ogmrip_subp_codec_get_forced_onlygboolean ogmrip_subp_codec_get_forced_only (OGMRipSubpCodec *subp); + +Gets whether to extract forced subtitles only. + + + +subp : + an OGMRipSubpCodec + +Returns : TRUE to extract forced subtitles only + + + +ogmrip_subp_codec_set_forced_only () +ogmrip_subp_codec_set_forced_onlyvoid ogmrip_subp_codec_set_forced_only (OGMRipSubpCodec *subp, + gboolean forced_only); + +Sets whether to extract forced subtitles only. + + + +subp : + an OGMRipSubpCodec + +forced_only : + TRUE to extract forced subtitles only + + + + + +Property Details +The <literal>"charset"</literal> property +OGMRipSubpCodec:charset "charset" guint : Read / Write +Set charset.Allowed values: <= 2 +Default value: 0 + +The <literal>"eol"</literal> property +OGMRipSubpCodec:eol "eol" guint : Read / Write +Set end of line style.Allowed values: <= 1 +Default value: 0 + +The <literal>"forced-only"</literal> property +OGMRipSubpCodec:forced-only "forced-only" gboolean : Read / Write +Set forced only.Default value: FALSE + +The <literal>"stream"</literal> property +OGMRipSubpCodec:stream "stream" gpointer : Read / Write +Set subp stream. + + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-subp.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-subp.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-subp.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-subp.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,238 +0,0 @@ - - - - - -OGMRipSubp -3 -OGMRIP Library - - - -OGMRipSubp -Base class for subtitles codecs - - - - -Synopsis - - - -#include <ogmrip-subp.h> - - - OGMRipSubp; -void ogmrip_subp_set_dvd_subp_stream (OGMRipSubp *subp, - OGMDvdSubpStream *stream); -OGMDvdSubpStream* ogmrip_subp_get_dvd_subp_stream (OGMRipSubp *subp); -gint ogmrip_subp_get_charset (OGMRipSubp *subp); -void ogmrip_subp_set_charset (OGMRipSubp *subp, - OGMRipCharset charset); -gint ogmrip_subp_get_eol_style (OGMRipSubp *subp); -void ogmrip_subp_set_eol_style (OGMRipSubp *subp, - OGMRipEolStyle eol); -gboolean ogmrip_subp_get_forced_only (OGMRipSubp *subp); -void ogmrip_subp_set_forced_only (OGMRipSubp *subp, - gboolean forced_only); - - - - - -Object Hierarchy - - - GObject - +----OGMJobSpawn - +----OGMJobContainer - +----OGMJobBin - +----OGMRipCodec - +----OGMRipSubp - - - - - - - - - -Properties - - - "charset" guint : Read / Write - "eol" guint : Read / Write - "forced-only" gboolean : Read / Write - "stream" gpointer : Read / Write - - - - - - -Description - - - - - - - - -Details - -<anchor id="OGMRipSubp-struct" role="struct"/>OGMRipSubp -OGMRipSubptypedef struct _OGMRipSubp OGMRipSubp; - - - - -<anchor id="ogmrip-subp-set-dvd-subp-stream" role="function"/>ogmrip_subp_set_dvd_subp_stream () -ogmrip_subp_set_dvd_subp_streamvoid ogmrip_subp_set_dvd_subp_stream (OGMRipSubp *subp, - OGMDvdSubpStream *stream); - -Sets the subtitle stream to encode. - - - -subp : - an OGMRipSubp - -stream : - an OGMDvdSubpStream - - - -<anchor id="ogmrip-subp-get-dvd-subp-stream" role="function"/>ogmrip_subp_get_dvd_subp_stream () -ogmrip_subp_get_dvd_subp_streamOGMDvdSubpStream* ogmrip_subp_get_dvd_subp_stream (OGMRipSubp *subp); - -Gets the subtitle stream to encode. - - - -subp : - an OGMRipSubp - -Returns : an OGMDvdSubpStream, or NULL - - - -<anchor id="ogmrip-subp-get-charset" role="function"/>ogmrip_subp_get_charset () -ogmrip_subp_get_charsetgint ogmrip_subp_get_charset (OGMRipSubp *subp); - -Gets the character set of text subtitles - - - -subp : - an OGMRipSubp - -Returns : an OGMRipCharset, or -1 - - - -<anchor id="ogmrip-subp-set-charset" role="function"/>ogmrip_subp_set_charset () -ogmrip_subp_set_charsetvoid ogmrip_subp_set_charset (OGMRipSubp *subp, - OGMRipCharset charset); - -Sets the character set of text subtitles - - - -subp : - an OGMRipSubp - -charset : - the OGMRipCharset - - - -<anchor id="ogmrip-subp-get-eol-style" role="function"/>ogmrip_subp_get_eol_style () -ogmrip_subp_get_eol_stylegint ogmrip_subp_get_eol_style (OGMRipSubp *subp); - -Gets the end-of-line characters of text subtitles - - - -subp : - an OGMRipSubp - -Returns : the OGMRipEolStyle, or -1 - - - -<anchor id="ogmrip-subp-set-eol-style" role="function"/>ogmrip_subp_set_eol_style () -ogmrip_subp_set_eol_stylevoid ogmrip_subp_set_eol_style (OGMRipSubp *subp, - OGMRipEolStyle eol); - -Sets the end-of-line characters of text subtitles - - - -subp : - an OGMRipSubp - -eol : - the OGMRipEolStyle - - - -<anchor id="ogmrip-subp-get-forced-only" role="function"/>ogmrip_subp_get_forced_only () -ogmrip_subp_get_forced_onlygboolean ogmrip_subp_get_forced_only (OGMRipSubp *subp); - -Gets whether to extract forced subtitles only. - - - -subp : - an OGMRipSubp - -Returns : TRUE to extract forced subtitles only - - - -<anchor id="ogmrip-subp-set-forced-only" role="function"/>ogmrip_subp_set_forced_only () -ogmrip_subp_set_forced_onlyvoid ogmrip_subp_set_forced_only (OGMRipSubp *subp, - gboolean forced_only); - -Sets whether to extract forced subtitles only. - - - -subp : - an OGMRipSubp - -forced_only : - TRUE to extract forced subtitles only - - - - - -Property Details -<anchor id="OGMRipSubp--charset"/>The "<literal>charset</literal>" property -OGMRipSubp:charset "charset" guint : Read / Write -Set charset.Allowed values: <= 2 -Default value: 0 - -<anchor id="OGMRipSubp--eol"/>The "<literal>eol</literal>" property -OGMRipSubp:eol "eol" guint : Read / Write -Set end of line style.Allowed values: <= 1 -Default value: 0 - -<anchor id="OGMRipSubp--forced-only"/>The "<literal>forced-only</literal>" property -OGMRipSubp:forced-only "forced-only" gboolean : Read / Write -Set forced only.Default value: FALSE - -<anchor id="OGMRipSubp--stream"/>The "<literal>stream</literal>" property -OGMRipSubp:stream "stream" gpointer : Read / Write -Set subp stream. - - - - - - - diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-theora.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-theora.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-theora.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-theora.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipTheora +OGMRipTheora 3 OGMRIP Library @@ -15,17 +15,13 @@ - + Synopsis - - - OGMRipTheora; OGMJobSpawn* ogmrip_theora_new (OGMDvdTitle *title, const gchar *output); - @@ -37,29 +33,27 @@ - + Description - + Details - -<anchor id="OGMRipTheora" role="struct"/>OGMRipTheora -OGMRipTheoratypedef struct { - OGMRipVideo parent_instance; - - OGMRipTheoraPriv *priv; + +OGMRipTheora +OGMRipTheoratypedef struct { + OGMRipVideoCodec parent_instance; } OGMRipTheora; - -<anchor id="ogmrip-theora-new" role="function"/>ogmrip_theora_new () -ogmrip_theora_newOGMJobSpawn* ogmrip_theora_new (OGMDvdTitle *title, + +ogmrip_theora_new () +ogmrip_theora_newOGMJobSpawn* ogmrip_theora_new (OGMDvdTitle *title, const gchar *output); Creates a new OGMRipTheora. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-version.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-version.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-version.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-version.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -Version information +Version information 3 OGMRIP Library @@ -15,20 +15,20 @@ - + Synopsis - - - +gboolean ogmrip_check_mencoder (void); +gboolean ogmrip_check_mplayer (void); +gboolean ogmrip_check_mplayer_dts (void); +gboolean ogmrip_check_mplayer_version (gint major, + gint minor, + gint rc, + gint pre); #define OGMRIP_MAJOR_VERSION #define OGMRIP_MINOR_VERSION #define OGMRIP_MICRO_VERSION -#define MPLAYER_MAJOR_VERSION -#define MPLAYER_MINOR_VERSION -#define MPLAYER_PRE_VERSION -#define MPLAYER_RC_VERSION #define OGMRIP_CHECK_VERSION (major,minor,micro) #define MPLAYER_CHECK_VERSION (major,minor,rc,pre) @@ -42,81 +42,104 @@ - + Description - + Details - -<anchor id="OGMRIP-MAJOR-VERSION:CAPS" role="macro"/>OGMRIP_MAJOR_VERSION -OGMRIP_MAJOR_VERSION#define OGMRIP_MAJOR_VERSION (0) - + +ogmrip_check_mencoder () +ogmrip_check_mencodergboolean ogmrip_check_mencoder (void); -Compile time major version of OGMRip +Checks if mencoder is installed. - - -<anchor id="OGMRIP-MINOR-VERSION:CAPS" role="macro"/>OGMRIP_MINOR_VERSION -OGMRIP_MINOR_VERSION#define OGMRIP_MINOR_VERSION (11) - + +Returns : TRUE if mencoder is installed + + + +ogmrip_check_mplayer () +ogmrip_check_mplayergboolean ogmrip_check_mplayer (void); -Compile time minor version of OGMRip +Checks if mplayer is installed. - - -<anchor id="OGMRIP-MICRO-VERSION:CAPS" role="macro"/>OGMRIP_MICRO_VERSION -OGMRIP_MICRO_VERSION#define OGMRIP_MICRO_VERSION (1) - + +Returns : TRUE if mplayer is installed + + + +ogmrip_check_mplayer_dts () +ogmrip_check_mplayer_dtsgboolean ogmrip_check_mplayer_dts (void); -Compile time micro version of OGMRip +Checks if mplayer has DTS support. - - -<anchor id="MPLAYER-MAJOR-VERSION:CAPS" role="macro"/>MPLAYER_MAJOR_VERSION -MPLAYER_MAJOR_VERSION#define MPLAYER_MAJOR_VERSION (99) - + +Returns : TRUE if DTS is supported + + + +ogmrip_check_mplayer_version () +ogmrip_check_mplayer_versiongboolean ogmrip_check_mplayer_version (gint major, + gint minor, + gint rc, + gint pre); -Compile time major version of MPlayer +Checks if the version of mplayer is older than a given version. - - -<anchor id="MPLAYER-MINOR-VERSION:CAPS" role="macro"/>MPLAYER_MINOR_VERSION -MPLAYER_MINOR_VERSION#define MPLAYER_MINOR_VERSION (99) + +major : + The major version number + +minor : + The minor version number + +rc : + The release candidate version number, or 0 if none + +pre : + The pre-release version number, or 0 if none + +Returns : TRUE if the version is older + + + +OGMRIP_MAJOR_VERSION +OGMRIP_MAJOR_VERSION#define OGMRIP_MAJOR_VERSION (0) -Compile time minor version of MPlayer +Compile time major version of OGMRip - -<anchor id="MPLAYER-PRE-VERSION:CAPS" role="macro"/>MPLAYER_PRE_VERSION -MPLAYER_PRE_VERSION#define MPLAYER_PRE_VERSION (99) + +OGMRIP_MINOR_VERSION +OGMRIP_MINOR_VERSION#define OGMRIP_MINOR_VERSION (12) -Compile time pre version of MPlayer +Compile time minor version of OGMRip - -<anchor id="MPLAYER-RC-VERSION:CAPS" role="macro"/>MPLAYER_RC_VERSION -MPLAYER_RC_VERSION#define MPLAYER_RC_VERSION (99) + +OGMRIP_MICRO_VERSION +OGMRIP_MICRO_VERSION#define OGMRIP_MICRO_VERSION (2) -Compile time rc version of MPlayer +Compile time micro version of OGMRip - -<anchor id="OGMRIP-CHECK-VERSION:CAPS" role="macro"/>OGMRIP_CHECK_VERSION() -OGMRIP_CHECK_VERSION#define OGMRIP_CHECK_VERSION(major,minor,micro) + +OGMRIP_CHECK_VERSION() +OGMRIP_CHECK_VERSION#define OGMRIP_CHECK_VERSION(major,minor,micro) Checks whether version is equal or greather than major.minor.micro @@ -132,9 +155,9 @@ A micro version number - -<anchor id="MPLAYER-CHECK-VERSION:CAPS" role="macro"/>MPLAYER_CHECK_VERSION() -MPLAYER_CHECK_VERSION#define MPLAYER_CHECK_VERSION(major,minor,rc,pre) + +MPLAYER_CHECK_VERSION() +MPLAYER_CHECK_VERSION#define MPLAYER_CHECK_VERSION(major,minor,rc,pre) Check if version is equal or greather than major.minor, major.minor-rc or major.minor-pre, in that order diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-video-codec.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-video-codec.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-video-codec.xml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-video-codec.xml 2008-09-28 19:28:17.000000000 +0200 @@ -0,0 +1,1108 @@ + + + + + +OGMRipVideoCodec +3 +OGMRIP Library + + + +OGMRipVideoCodec +Base class for video codecs + + + + +Synopsis + + + +#include <ogmrip-video-codec.h> + + OGMRipVideoCodec; +gboolean ogmrip_video_codec_autocrop (OGMRipVideoCodec *video, + guint nframes); +void ogmrip_video_codec_autoscale (OGMRipVideoCodec *video); +void ogmrip_video_codec_autobitrate (OGMRipVideoCodec *video, + guint64 nonvideo_size, + guint64 overhead_size, + guint64 total_size); +gboolean ogmrip_video_codec_get_4mv (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_4mv (OGMRipVideoCodec *video, + gboolean v4mv); +gint ogmrip_video_codec_get_angle (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_angle (OGMRipVideoCodec *video, + guint angle); +gint ogmrip_video_codec_get_bitrate (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_bitrate (OGMRipVideoCodec *video, + guint bitrate); +gdouble ogmrip_video_codec_get_bits_per_pixel + (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_bits_per_pixel + (OGMRipVideoCodec *video, + gdouble bpp); +gboolean ogmrip_video_codec_get_cartoon (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_cartoon (OGMRipVideoCodec *video, + gboolean cartoon); +gboolean ogmrip_video_codec_get_crop_size (OGMRipVideoCodec *video, + guint *x, + guint *y, + guint *width, + guint *height); +void ogmrip_video_codec_set_crop_size (OGMRipVideoCodec *video, + guint x, + guint y, + guint width, + guint height); +gboolean ogmrip_video_codec_get_deblock (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_deblock (OGMRipVideoCodec *video, + gboolean deblock); +gint ogmrip_video_codec_get_deinterlacer (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_deinterlacer (OGMRipVideoCodec *video, + OGMRipDeintType deint); +gboolean ogmrip_video_codec_get_denoise (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_denoise (OGMRipVideoCodec *video, + gboolean denoise); +gboolean ogmrip_video_codec_get_dering (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_dering (OGMRipVideoCodec *video, + gboolean dering); +OGMDvdAudioStream* ogmrip_video_codec_get_ensure_sync (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_ensure_sync (OGMRipVideoCodec *video, + OGMDvdAudioStream *stream); +gboolean ogmrip_video_codec_get_grayscale (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_grayscale (OGMRipVideoCodec *video, + gboolean grayscale); +gint ogmrip_video_codec_get_max_b_frames (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_max_b_frames (OGMRipVideoCodec *video, + guint max_b_frames); +gboolean ogmrip_video_codec_get_max_size (OGMRipVideoCodec *video, + guint *width, + guint *height, + gboolean *expand); +void ogmrip_video_codec_set_max_size (OGMRipVideoCodec *video, + guint width, + guint height, + gboolean expand); +gint ogmrip_video_codec_get_passes (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_passes (OGMRipVideoCodec *video, + guint pass); +gboolean ogmrip_video_codec_get_qpel (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_qpel (OGMRipVideoCodec *video, + gboolean qpel); +gint ogmrip_video_codec_get_quality (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_quality (OGMRipVideoCodec *video, + OGMRipQualityType quality); +gdouble ogmrip_video_codec_get_quantizer (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_quantizer (OGMRipVideoCodec *video, + gdouble quantizer); +void ogmrip_video_codec_get_raw_size (OGMRipVideoCodec *video, + guint *width, + guint *height); +gboolean ogmrip_video_codec_get_scale_size (OGMRipVideoCodec *video, + guint *width, + guint *height); +void ogmrip_video_codec_set_scale_size (OGMRipVideoCodec *video, + guint width, + guint height); +gint ogmrip_video_codec_get_scaler (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_scaler (OGMRipVideoCodec *video, + OGMRipScalerType scaler); +gint ogmrip_video_codec_get_threads (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_threads (OGMRipVideoCodec *video, + guint threads); +gboolean ogmrip_video_codec_get_trellis (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_trellis (OGMRipVideoCodec *video, + gboolean trellis); +gboolean ogmrip_video_codec_get_turbo (OGMRipVideoCodec *video); +void ogmrip_video_codec_set_turbo (OGMRipVideoCodec *video, + gboolean turbo); +gint ogmrip_video_codec_get_start_delay (OGMRipVideoCodec *video); + + + + +Object Hierarchy + + GObject + +----OGMJobSpawn + +----OGMJobContainer + +----OGMJobBin + +----OGMRipCodec + +----OGMRipVideoCodec + + + + + + + + + +Properties + + "angle" guint : Read / Write + "bframes" guint : Read / Write + "bitrate" guint : Read / Write + "bpp" gdouble : Read / Write + "cartoon" gboolean : Read / Write + "deblock" gboolean : Read / Write + "denoise" gboolean : Read / Write + "dering" gboolean : Read / Write + "grayscale" gboolean : Read / Write + "passes" guint : Read / Write + "qpel" gboolean : Read / Write + "quantizer" gdouble : Read / Write + "threads" guint : Read / Write + "trellis" gboolean : Read / Write + "turbo" gboolean : Read / Write + "v4mv" gboolean : Read / Write + + + + + + +Description + + + + + + + + +Details + +OGMRipVideoCodec +OGMRipVideoCodectypedef struct _OGMRipVideoCodec OGMRipVideoCodec; + + + + +ogmrip_video_codec_autocrop () +ogmrip_video_codec_autocropgboolean ogmrip_video_codec_autocrop (OGMRipVideoCodec *video, + guint nframes); + +Autodetects the cropping parameters. + + + +video : + an OGMRipVideoCodec + +nframes : + the number of frames + +Returns : FALSE, on error or cancel + + + +ogmrip_video_codec_autoscale () +ogmrip_video_codec_autoscalevoid ogmrip_video_codec_autoscale (OGMRipVideoCodec *video); + +Autodetects the scaling parameters. + + + +video : + an OGMRipVideoCodec + + + +ogmrip_video_codec_autobitrate () +ogmrip_video_codec_autobitratevoid ogmrip_video_codec_autobitrate (OGMRipVideoCodec *video, + guint64 nonvideo_size, + guint64 overhead_size, + guint64 total_size); + +Autodetects the video bitrate. + + + +video : + an OGMRipVideoCodec + +nonvideo_size : + the size of the non video streams + +overhead_size : + the size of the overhead + +total_size : + the total targetted size + + + +ogmrip_video_codec_get_4mv () +ogmrip_video_codec_get_4mvgboolean ogmrip_video_codec_get_4mv (OGMRipVideoCodec *video); + +Gets whether 4 motion vectors per macroblock are allowed. + + + +video : + an OGMRipVideoCodec + +Returns : TRUE if 4 motion vectors per macroblock are allowed + + + +ogmrip_video_codec_set_4mv () +ogmrip_video_codec_set_4mvvoid ogmrip_video_codec_set_4mv (OGMRipVideoCodec *video, + gboolean v4mv); + +Sets whether to allow 4 motion vectors per macroblock. + + + +video : + an OGMRipVideoCodec + +v4mv : + TRUE to allow 4 motion vectors per macroblock + + + +ogmrip_video_codec_get_angle () +ogmrip_video_codec_get_anglegint ogmrip_video_codec_get_angle (OGMRipVideoCodec *video); + +Gets the current angle. + + + +video : + an OGMRipVideoCodec + +Returns : the angle, or -1 + + + +ogmrip_video_codec_set_angle () +ogmrip_video_codec_set_anglevoid ogmrip_video_codec_set_angle (OGMRipVideoCodec *video, + guint angle); + +Sets the angle to encode. + + + +video : + an OGMRipVideoCodec + +angle : + the angle + + + +ogmrip_video_codec_get_bitrate () +ogmrip_video_codec_get_bitrategint ogmrip_video_codec_get_bitrate (OGMRipVideoCodec *video); + +Gets the video bitrate in bits/second. + + + +video : + an OGMRipVideoCodec + +Returns : the video bitrate, or -1 + + + +ogmrip_video_codec_set_bitrate () +ogmrip_video_codec_set_bitratevoid ogmrip_video_codec_set_bitrate (OGMRipVideoCodec *video, + guint bitrate); + +Sets the video bitrate to be used in bits/second, 4000 being the lowest and +24000000 the highest available bitrates. + + + +video : + an OGMRipVideoCodec + +bitrate : + the video bitrate + + + +ogmrip_video_codec_get_bits_per_pixel () +ogmrip_video_codec_get_bits_per_pixelgdouble ogmrip_video_codec_get_bits_per_pixel + (OGMRipVideoCodec *video); + +Gets the number of bits per pixel. + + + +video : + an OGMRipVideoCodec + +Returns : the number of bits per pixel, or -1 + + + +ogmrip_video_codec_set_bits_per_pixel () +ogmrip_video_codec_set_bits_per_pixelvoid ogmrip_video_codec_set_bits_per_pixel + (OGMRipVideoCodec *video, + gdouble bpp); + +Sets the number of bits per pixel to be used. + + + +video : + an OGMRipVideoCodec + +bpp : + the number of bits per pixel + + + +ogmrip_video_codec_get_cartoon () +ogmrip_video_codec_get_cartoongboolean ogmrip_video_codec_get_cartoon (OGMRipVideoCodec *video); + +Gets whether the movie is a cartoon. + + + +video : + an OGMRipVideoCodec + +Returns : TRUE if movie is a cartoon + + + +ogmrip_video_codec_set_cartoon () +ogmrip_video_codec_set_cartoonvoid ogmrip_video_codec_set_cartoon (OGMRipVideoCodec *video, + gboolean cartoon); + +Sets whether the movie is a cartoon. + + + +video : + an OGMRipVideoCodec + +cartoon : + TRUE if movie is a cartoon + + + +ogmrip_video_codec_get_crop_size () +ogmrip_video_codec_get_crop_sizegboolean ogmrip_video_codec_get_crop_size (OGMRipVideoCodec *video, + guint *x, + guint *y, + guint *width, + guint *height); + +Gets whether the video will be cropped and the crop size. + + + +video : + an OGMRipVideoCodec + +x : + a pointer to store the cropped x position + +y : + a pointer to store the cropped y position + +width : + a pointer to store the cropped width + +height : + a pointer to store the cropped height + +Returns : TRUE if the video will be cropped + + + +ogmrip_video_codec_set_crop_size () +ogmrip_video_codec_set_crop_sizevoid ogmrip_video_codec_set_crop_size (OGMRipVideoCodec *video, + guint x, + guint y, + guint width, + guint height); + +Sets the crop size of the movie. + + + +video : + an OGMRipVideoCodec + +x : + the cropped x position + +y : + the cropped y position + +width : + the cropped width + +height : + the cropped height + + + +ogmrip_video_codec_get_deblock () +ogmrip_video_codec_get_deblockgboolean ogmrip_video_codec_get_deblock (OGMRipVideoCodec *video); + +Gets whether a deblocking filter will be applied. + + + +video : + an OGMRipVideoCodec + +Returns : TRUE if a deblocking filter will be applied + + + +ogmrip_video_codec_set_deblock () +ogmrip_video_codec_set_deblockvoid ogmrip_video_codec_set_deblock (OGMRipVideoCodec *video, + gboolean deblock); + +Sets whether to apply a deblocking filter. + + + +video : + an OGMRipVideoCodec + +deblock : + TRUE to apply a deblocking filter + + + +ogmrip_video_codec_get_deinterlacer () +ogmrip_video_codec_get_deinterlacergint ogmrip_video_codec_get_deinterlacer (OGMRipVideoCodec *video); + +Gets the currnet deinterlacer. + + + +video : + an OGMRipVideoCodec + +Returns : the deinterlacer, or -1 + + + +ogmrip_video_codec_set_deinterlacer () +ogmrip_video_codec_set_deinterlacervoid ogmrip_video_codec_set_deinterlacer (OGMRipVideoCodec *video, + OGMRipDeintType deint); + +Sets the deinterlacer to be used. + + + +video : + an OGMRipVideoCodec + +deint : + an OGMRipDeintType + + + +ogmrip_video_codec_get_denoise () +ogmrip_video_codec_get_denoisegboolean ogmrip_video_codec_get_denoise (OGMRipVideoCodec *video); + +Gets whether to reduce image noise. + + + +video : + an OGMRipVideoCodec + +Returns : TRUE to reduce image noise + + + +ogmrip_video_codec_set_denoise () +ogmrip_video_codec_set_denoisevoid ogmrip_video_codec_set_denoise (OGMRipVideoCodec *video, + gboolean denoise); + +Sets whether to reduce image noise. + + + +video : + an OGMRipVideoCodec + +denoise : + TRUE to reduce image noise + + + +ogmrip_video_codec_get_dering () +ogmrip_video_codec_get_deringgboolean ogmrip_video_codec_get_dering (OGMRipVideoCodec *video); + +Gets whether a deringing filter will be applied. + + + +video : + an OGMRipVideoCodec + +Returns : TRUE if a deringing filter will be applied + + + +ogmrip_video_codec_set_dering () +ogmrip_video_codec_set_deringvoid ogmrip_video_codec_set_dering (OGMRipVideoCodec *video, + gboolean dering); + +Sets whether to apply a deringing filter. + + + +video : + an OGMRipVideoCodec + +dering : + TRUE to apply a deringing filter + + + +ogmrip_video_codec_get_ensure_sync () +ogmrip_video_codec_get_ensure_syncOGMDvdAudioStream* ogmrip_video_codec_get_ensure_sync (OGMRipVideoCodec *video); + +Gets the audio stream that will be encoded along with the video to ensure +the A/V synchronization. + + + +video : + an OGMRipVideoCodec + +Returns : the OGMDvdAudioStream, or NULL + + + +ogmrip_video_codec_set_ensure_sync () +ogmrip_video_codec_set_ensure_syncvoid ogmrip_video_codec_set_ensure_sync (OGMRipVideoCodec *video, + OGMDvdAudioStream *stream); + +Sets the audio stream that will be encoded along with the video to ensure +the A/V synchronization. + + + +video : + an OGMRipVideoCodec + +stream : + an OGMDvdAudioStream + + + +ogmrip_video_codec_get_grayscale () +ogmrip_video_codec_get_grayscalegboolean ogmrip_video_codec_get_grayscale (OGMRipVideoCodec *video); + +Gets whether the movie is grayscale. + + + +video : + an OGMRipVideoCodec + +Returns : TRUE if movie is grayscale + + + +ogmrip_video_codec_set_grayscale () +ogmrip_video_codec_set_grayscalevoid ogmrip_video_codec_set_grayscale (OGMRipVideoCodec *video, + gboolean grayscale); + +Sets whether the movie is grayscale. + + + +video : + an OGMRipVideoCodec + +grayscale : + TRUE if movie is grayscale + + + +ogmrip_video_codec_get_max_b_frames () +ogmrip_video_codec_get_max_b_framesgint ogmrip_video_codec_get_max_b_frames (OGMRipVideoCodec *video); + +Gets the maximum number of B-frames to put between I/P-frames. + + + +video : + an OGMRipVideoCodec + +Returns : the maximum number of B-frames, or -1 + + + +ogmrip_video_codec_set_max_b_frames () +ogmrip_video_codec_set_max_b_framesvoid ogmrip_video_codec_set_max_b_frames (OGMRipVideoCodec *video, + guint max_b_frames); + +Sets the maximum number of B-frames to put between I/P-frames. + + + +video : + an OGMRipVideoCodec + +max_b_frames : + the maximum number of B-frames + + + +ogmrip_video_codec_get_max_size () +ogmrip_video_codec_get_max_sizegboolean ogmrip_video_codec_get_max_size (OGMRipVideoCodec *video, + guint *width, + guint *height, + gboolean *expand); + +Gets wether the video has a maximum size and the maximum size. + + + +video : + an OGMRipVideoCodec + +width : + a pointer to store the maximum width + +height : + a pointer to store the maximum height + +expand : + whether the video must be expanded + +Returns : TRUE if the video has a maximum size + + + +ogmrip_video_codec_set_max_size () +ogmrip_video_codec_set_max_sizevoid ogmrip_video_codec_set_max_size (OGMRipVideoCodec *video, + guint width, + guint height, + gboolean expand); + +Sets the maximum size of the movie. + + + +video : + an OGMRipVideoCodec + +width : + the maximum width + +height : + the maximum height + +expand : + wheter to expand the video + + + +ogmrip_video_codec_get_passes () +ogmrip_video_codec_get_passesgint ogmrip_video_codec_get_passes (OGMRipVideoCodec *video); + +Gets the number of passes. + + + +video : + an OGMRipVideoCodec + +Returns : the pass number, or -1 + + + +ogmrip_video_codec_set_passes () +ogmrip_video_codec_set_passesvoid ogmrip_video_codec_set_passes (OGMRipVideoCodec *video, + guint pass); + +Sets the number of passes. + + + +video : + an OGMRipVideoCodec + +pass : + the pass number + + + +ogmrip_video_codec_get_qpel () +ogmrip_video_codec_get_qpelgboolean ogmrip_video_codec_get_qpel (OGMRipVideoCodec *video); + +Sets whether quarter pel motion compensation is used. + + + +video : + an OGMRipVideoCodec + +Returns : TRUE if quarter pel motion compensation is used + + + +ogmrip_video_codec_set_qpel () +ogmrip_video_codec_set_qpelvoid ogmrip_video_codec_set_qpel (OGMRipVideoCodec *video, + gboolean qpel); + +Sets whether to use quarter pel motion compensation. + + + +video : + an OGMRipVideoCodec + +qpel : + TRUE to use quarter pel motion compensation + + + +ogmrip_video_codec_get_quality () +ogmrip_video_codec_get_qualitygint ogmrip_video_codec_get_quality (OGMRipVideoCodec *video); + +Gets the quality of the encoding. + + + +video : + an OGMRipVideoCodec + +Returns : the OGMRipQualityType, or -1 + + + +ogmrip_video_codec_set_quality () +ogmrip_video_codec_set_qualityvoid ogmrip_video_codec_set_quality (OGMRipVideoCodec *video, + OGMRipQualityType quality); + +Sets the quality of the encoding. + + + +video : + an OGMRipVideoCodec + +quality : + the OGMRipQualityType + + + +ogmrip_video_codec_get_quantizer () +ogmrip_video_codec_get_quantizergdouble ogmrip_video_codec_get_quantizer (OGMRipVideoCodec *video); + +Gets the video quantizer. + + + +video : + an OGMRipVideoCodec + +Returns : the video quantizer, or -1 + + + +ogmrip_video_codec_set_quantizer () +ogmrip_video_codec_set_quantizervoid ogmrip_video_codec_set_quantizer (OGMRipVideoCodec *video, + gdouble quantizer); + +Sets the video quantizer to be used, 1 being the lowest and 31 the highest +available quantizers. + + + +video : + an OGMRipVideoCodec + +quantizer : + the video quantizer + + + +ogmrip_video_codec_get_raw_size () +ogmrip_video_codec_get_raw_sizevoid ogmrip_video_codec_get_raw_size (OGMRipVideoCodec *video, + guint *width, + guint *height); + +Gets the raw size of the video. + + + +video : + an OGMRipVideoCodec + +width : + a pointer to store the width + +height : + a pointer to store the height + + + +ogmrip_video_codec_get_scale_size () +ogmrip_video_codec_get_scale_sizegboolean ogmrip_video_codec_get_scale_size (OGMRipVideoCodec *video, + guint *width, + guint *height); + +Gets whether the video will be scaled and the scale size. + + + +video : + an OGMRipVideoCodec + +width : + a pointer to store the scaled width + +height : + a pointer to store the scaled height + +Returns : TRUE if the video will be scaled + + + +ogmrip_video_codec_set_scale_size () +ogmrip_video_codec_set_scale_sizevoid ogmrip_video_codec_set_scale_size (OGMRipVideoCodec *video, + guint width, + guint height); + +Sets the scaled size of the movie. + + + +video : + an OGMRipVideoCodec + +width : + the scaled width + +height : + the scaled height + + + +ogmrip_video_codec_get_scaler () +ogmrip_video_codec_get_scalergint ogmrip_video_codec_get_scaler (OGMRipVideoCodec *video); + +Gets the current software scaler. + + + +video : + an OGMRipVideoCodec + +Returns : the software scaler, or -1 + + + +ogmrip_video_codec_set_scaler () +ogmrip_video_codec_set_scalervoid ogmrip_video_codec_set_scaler (OGMRipVideoCodec *video, + OGMRipScalerType scaler); + +Sets the software scaler to be used. + + + +video : + an OGMRipVideoCodec + +scaler : + an OGMRipScalerType + + + +ogmrip_video_codec_get_threads () +ogmrip_video_codec_get_threadsgint ogmrip_video_codec_get_threads (OGMRipVideoCodec *video); + +Gets the number of threads. + + + +video : + an OGMRipVideoCodec + +Returns : the number of threads, or -1 + + + +ogmrip_video_codec_set_threads () +ogmrip_video_codec_set_threadsvoid ogmrip_video_codec_set_threads (OGMRipVideoCodec *video, + guint threads); + +Sets the number of threads to be used. + + + +video : + an OGMRipVideoCodec + +threads : + the number of threads + + + +ogmrip_video_codec_get_trellis () +ogmrip_video_codec_get_trellisgboolean ogmrip_video_codec_get_trellis (OGMRipVideoCodec *video); + +Gets whether trellis quantization is enabled. + + + +video : + an OGMRipVideoCodec + +Returns : TRUE if trellis quantization is enabled + + + +ogmrip_video_codec_set_trellis () +ogmrip_video_codec_set_trellisvoid ogmrip_video_codec_set_trellis (OGMRipVideoCodec *video, + gboolean trellis); + +Sets whether trellis quantization will be enabled. + + + +video : + an OGMRipVideoCodec + +trellis : + TRUE to enable trellis quantization + + + +ogmrip_video_codec_get_turbo () +ogmrip_video_codec_get_turbogboolean ogmrip_video_codec_get_turbo (OGMRipVideoCodec *video); + +Gets whether turbo is enabled. + + + +video : + an OGMRipVideoCodec + +Returns : TRUE if turbo is enabled + + + +ogmrip_video_codec_set_turbo () +ogmrip_video_codec_set_turbovoid ogmrip_video_codec_set_turbo (OGMRipVideoCodec *video, + gboolean turbo); + +Sets whether to enable turbo. + + + +video : + an OGMRipVideoCodec + +turbo : + TRUE to enable turbo + + + +ogmrip_video_codec_get_start_delay () +ogmrip_video_codec_get_start_delaygint ogmrip_video_codec_get_start_delay (OGMRipVideoCodec *video); + +Gets the start delay that must be applied to audio streams when merging. + + + +video : + an OGMRipVideoCodec + +Returns : the start delay, or -1 + + + + + +Property Details +The <literal>"angle"</literal> property +OGMRipVideoCodec:angle "angle" guint : Read / Write +Set angle.Allowed values: >= 1 +Default value: 1 + +The <literal>"bframes"</literal> property +OGMRipVideoCodec:bframes "bframes" guint : Read / Write +Set b-frames.Allowed values: <= 4 +Default value: 2 + +The <literal>"bitrate"</literal> property +OGMRipVideoCodec:bitrate "bitrate" guint : Read / Write +Set bitrate.Allowed values: [4000,24000000] +Default value: 800000 + +The <literal>"bpp"</literal> property +OGMRipVideoCodec:bpp "bpp" gdouble : Read / Write +Set bits per pixel.Allowed values: [0,1] +Default value: 0.25 + +The <literal>"cartoon"</literal> property +OGMRipVideoCodec:cartoon "cartoon" gboolean : Read / Write +Set cartoon.Default value: FALSE + +The <literal>"deblock"</literal> property +OGMRipVideoCodec:deblock "deblock" gboolean : Read / Write +Set deblock.Default value: TRUE + +The <literal>"denoise"</literal> property +OGMRipVideoCodec:denoise "denoise" gboolean : Read / Write +Set denoise.Default value: FALSE + +The <literal>"dering"</literal> property +OGMRipVideoCodec:dering "dering" gboolean : Read / Write +Set dering.Default value: TRUE + +The <literal>"grayscale"</literal> property +OGMRipVideoCodec:grayscale "grayscale" gboolean : Read / Write +Set grayscale.Default value: FALSE + +The <literal>"passes"</literal> property +OGMRipVideoCodec:passes "passes" guint : Read / Write +Set the number of passes.Allowed values: >= 1 +Default value: 1 + +The <literal>"qpel"</literal> property +OGMRipVideoCodec:qpel "qpel" gboolean : Read / Write +Set quarter pel motion compensation.Default value: FALSE + +The <literal>"quantizer"</literal> property +OGMRipVideoCodec:quantizer "quantizer" gdouble : Read / Write +Set quantizer.Allowed values: [-1,31] +Default value: -1 + +The <literal>"threads"</literal> property +OGMRipVideoCodec:threads "threads" guint : Read / Write +Set the number of threads.Default value: 0 + +The <literal>"trellis"</literal> property +OGMRipVideoCodec:trellis "trellis" gboolean : Read / Write +Set trellis.Default value: TRUE + +The <literal>"turbo"</literal> property +OGMRipVideoCodec:turbo "turbo" gboolean : Read / Write +Set turbo.Default value: FALSE + +The <literal>"v4mv"</literal> property +OGMRipVideoCodec:v4mv "v4mv" gboolean : Read / Write +Set 4 motion vectors per macroblock.Default value: TRUE + + + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-video.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-video.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-video.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-video.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,1005 +0,0 @@ - - - - - -OGMRipVideo -3 -OGMRIP Library - - - -OGMRipVideo -Base class for video codecs - - - - -Synopsis - - - -#include <ogmrip-video.h> - - - OGMRipVideo; -gboolean ogmrip_video_autocrop (OGMRipVideo *video, - guint nframes); -void ogmrip_video_autoscale (OGMRipVideo *video); -void ogmrip_video_autobitrate (OGMRipVideo *video, - guint64 nonvideo_size, - guint64 overhead_size, - guint64 total_size); -gboolean ogmrip_video_get_4mv (OGMRipVideo *video); -void ogmrip_video_set_4mv (OGMRipVideo *video, - gboolean v4mv); -gint ogmrip_video_get_angle (OGMRipVideo *video); -void ogmrip_video_set_angle (OGMRipVideo *video, - guint angle); -gint ogmrip_video_get_bitrate (OGMRipVideo *video); -void ogmrip_video_set_bitrate (OGMRipVideo *video, - guint bitrate); -gdouble ogmrip_video_get_bits_per_pixel (OGMRipVideo *video); -void ogmrip_video_set_bits_per_pixel (OGMRipVideo *video, - gdouble bpp); -gboolean ogmrip_video_get_cartoon (OGMRipVideo *video); -void ogmrip_video_set_cartoon (OGMRipVideo *video, - gboolean cartoon); -gboolean ogmrip_video_get_crop_size (OGMRipVideo *video, - guint *x, - guint *y, - guint *width, - guint *height); -void ogmrip_video_set_crop_size (OGMRipVideo *video, - guint x, - guint y, - guint width, - guint height); -gboolean ogmrip_video_get_deblock (OGMRipVideo *video); -void ogmrip_video_set_deblock (OGMRipVideo *video, - gboolean deblock); -gint ogmrip_video_get_deinterlacer (OGMRipVideo *video); -void ogmrip_video_set_deinterlacer (OGMRipVideo *video, - OGMRipDeintType deint); -gboolean ogmrip_video_get_denoise (OGMRipVideo *video); -void ogmrip_video_set_denoise (OGMRipVideo *video, - gboolean denoise); -gboolean ogmrip_video_get_dering (OGMRipVideo *video); -void ogmrip_video_set_dering (OGMRipVideo *video, - gboolean dering); -OGMDvdAudioStream* ogmrip_video_get_ensure_sync (OGMRipVideo *video); -void ogmrip_video_set_ensure_sync (OGMRipVideo *video, - OGMDvdAudioStream *stream); -gboolean ogmrip_video_get_grayscale (OGMRipVideo *video); -void ogmrip_video_set_grayscale (OGMRipVideo *video, - gboolean grayscale); -gchar* ogmrip_video_get_log (OGMRipVideo *video); -void ogmrip_video_set_log (OGMRipVideo *video, - const gchar *log); -gint ogmrip_video_get_max_b_frames (OGMRipVideo *video); -void ogmrip_video_set_max_b_frames (OGMRipVideo *video, - guint max_b_frames); -gint ogmrip_video_get_pass (OGMRipVideo *video); -void ogmrip_video_set_pass (OGMRipVideo *video, - guint pass); -gboolean ogmrip_video_get_pullup (OGMRipVideo *video); -void ogmrip_video_set_pullup (OGMRipVideo *video, - gboolean pullup); -gboolean ogmrip_video_get_qpel (OGMRipVideo *video); -void ogmrip_video_set_qpel (OGMRipVideo *video, - gboolean qpel); -gint ogmrip_video_get_quality (OGMRipVideo *video); -void ogmrip_video_set_quality (OGMRipVideo *video, - OGMRipQualityType quality); -gdouble ogmrip_video_get_quantizer (OGMRipVideo *video); -void ogmrip_video_set_quantizer (OGMRipVideo *video, - gdouble quantizer); -void ogmrip_video_get_raw_size (OGMRipVideo *video, - guint *width, - guint *height); -gboolean ogmrip_video_get_scale_size (OGMRipVideo *video, - guint *width, - guint *height); -void ogmrip_video_set_scale_size (OGMRipVideo *video, - guint width, - guint height); -gint ogmrip_video_get_scaler (OGMRipVideo *video); -void ogmrip_video_set_scaler (OGMRipVideo *video, - OGMRipScalerType scaler); -gint ogmrip_video_get_threads (OGMRipVideo *video); -void ogmrip_video_set_threads (OGMRipVideo *video, - guint threads); -gboolean ogmrip_video_get_trellis (OGMRipVideo *video); -void ogmrip_video_set_trellis (OGMRipVideo *video, - gboolean trellis); -gboolean ogmrip_video_get_turbo (OGMRipVideo *video); -void ogmrip_video_set_turbo (OGMRipVideo *video, - gboolean turbo); - - - - - -Object Hierarchy - - - GObject - +----OGMJobSpawn - +----OGMJobContainer - +----OGMJobBin - +----OGMRipCodec - +----OGMRipVideo - - - - - - - - - - - - -Description - - - - - - - - -Details - -<anchor id="OGMRipVideo-struct" role="struct"/>OGMRipVideo -OGMRipVideotypedef struct _OGMRipVideo OGMRipVideo; - - - - -<anchor id="ogmrip-video-autocrop" role="function"/>ogmrip_video_autocrop () -ogmrip_video_autocropgboolean ogmrip_video_autocrop (OGMRipVideo *video, - guint nframes); - -Autodetects the cropping parameters. - - - -video : - an OGMRipVideo - -nframes : - the number of frames - -Returns : FALSE, on error or cancel - - - -<anchor id="ogmrip-video-autoscale" role="function"/>ogmrip_video_autoscale () -ogmrip_video_autoscalevoid ogmrip_video_autoscale (OGMRipVideo *video); - -Autodetects the scaling parameters. - - - -video : - an OGMRipVideo - - - -<anchor id="ogmrip-video-autobitrate" role="function"/>ogmrip_video_autobitrate () -ogmrip_video_autobitratevoid ogmrip_video_autobitrate (OGMRipVideo *video, - guint64 nonvideo_size, - guint64 overhead_size, - guint64 total_size); - -Autodetects the video bitrate. - - - -video : - an OGMRipVideo - -nonvideo_size : - the size of the non video streams - -overhead_size : - the size of the overhead - -total_size : - the total targetted size - - - -<anchor id="ogmrip-video-get-4mv" role="function"/>ogmrip_video_get_4mv () -ogmrip_video_get_4mvgboolean ogmrip_video_get_4mv (OGMRipVideo *video); - -Gets whether 4 motion vectors per macroblock are allowed. - - - -video : - an OGMRipVideo - -Returns : TRUE if 4 motion vectors per macroblock are allowed - - - -<anchor id="ogmrip-video-set-4mv" role="function"/>ogmrip_video_set_4mv () -ogmrip_video_set_4mvvoid ogmrip_video_set_4mv (OGMRipVideo *video, - gboolean v4mv); - -Sets whether to allow 4 motion vectors per macroblock. - - - -video : - an OGMRipVideo - -v4mv : - TRUE to allow 4 motion vectors per macroblock - - - -<anchor id="ogmrip-video-get-angle" role="function"/>ogmrip_video_get_angle () -ogmrip_video_get_anglegint ogmrip_video_get_angle (OGMRipVideo *video); - -Gets the current angle. - - - -video : - an OGMRipVideo - -Returns : the angle, or -1 - - - -<anchor id="ogmrip-video-set-angle" role="function"/>ogmrip_video_set_angle () -ogmrip_video_set_anglevoid ogmrip_video_set_angle (OGMRipVideo *video, - guint angle); - -Sets the angle to encode. - - - -video : - an OGMRipVideo - -angle : - the angle - - - -<anchor id="ogmrip-video-get-bitrate" role="function"/>ogmrip_video_get_bitrate () -ogmrip_video_get_bitrategint ogmrip_video_get_bitrate (OGMRipVideo *video); - -Gets the video bitrate in bits/second. - - - -video : - an OGMRipVideo - -Returns : the video bitrate, or -1 - - - -<anchor id="ogmrip-video-set-bitrate" role="function"/>ogmrip_video_set_bitrate () -ogmrip_video_set_bitratevoid ogmrip_video_set_bitrate (OGMRipVideo *video, - guint bitrate); - -Sets the video bitrate to be used in bits/second, 4000 being the lowest and -24000000 the highest available bitrates. - - - -video : - an OGMRipVideo - -bitrate : - the video bitrate - - - -<anchor id="ogmrip-video-get-bits-per-pixel" role="function"/>ogmrip_video_get_bits_per_pixel () -ogmrip_video_get_bits_per_pixelgdouble ogmrip_video_get_bits_per_pixel (OGMRipVideo *video); - -Gets the number of bits per pixel. - - - -video : - an OGMRipVideo - -Returns : the number of bits per pixel, or -1 - - - -<anchor id="ogmrip-video-set-bits-per-pixel" role="function"/>ogmrip_video_set_bits_per_pixel () -ogmrip_video_set_bits_per_pixelvoid ogmrip_video_set_bits_per_pixel (OGMRipVideo *video, - gdouble bpp); - -Sets the number of bits per pixel to be used. - - - -video : - an OGMRipVideo - -bpp : - the number of bits per pixel - - - -<anchor id="ogmrip-video-get-cartoon" role="function"/>ogmrip_video_get_cartoon () -ogmrip_video_get_cartoongboolean ogmrip_video_get_cartoon (OGMRipVideo *video); - -Gets whether the movie is a cartoon. - - - -video : - an OGMRipVideo - -Returns : TRUE if movie is a cartoon - - - -<anchor id="ogmrip-video-set-cartoon" role="function"/>ogmrip_video_set_cartoon () -ogmrip_video_set_cartoonvoid ogmrip_video_set_cartoon (OGMRipVideo *video, - gboolean cartoon); - -Sets whether the movie is a cartoon. - - - -video : - an OGMRipVideo - -cartoon : - TRUE if movie is a cartoon - - - -<anchor id="ogmrip-video-get-crop-size" role="function"/>ogmrip_video_get_crop_size () -ogmrip_video_get_crop_sizegboolean ogmrip_video_get_crop_size (OGMRipVideo *video, - guint *x, - guint *y, - guint *width, - guint *height); - -Gets whether the video will be cropped and the crop size. - - - -video : - an OGMRipVideo - -x : - a pointer to store the cropped x position - -y : - a pointer to store the cropped y position - -width : - a pointer to store the cropped width - -height : - a pointer to store the cropped height - -Returns : TRUE if the video will be cropped - - - -<anchor id="ogmrip-video-set-crop-size" role="function"/>ogmrip_video_set_crop_size () -ogmrip_video_set_crop_sizevoid ogmrip_video_set_crop_size (OGMRipVideo *video, - guint x, - guint y, - guint width, - guint height); - -Sets the crop size of the movie. - - - -video : - an OGMRipVideo - -x : - the cropped x position - -y : - the cropped y position - -width : - the cropped width - -height : - the cropped height - - - -<anchor id="ogmrip-video-get-deblock" role="function"/>ogmrip_video_get_deblock () -ogmrip_video_get_deblockgboolean ogmrip_video_get_deblock (OGMRipVideo *video); - -Gets whether a deblocking filter will be applied. - - - -video : - an OGMRipVideo - -Returns : TRUE if a deblocking filter will be applied - - - -<anchor id="ogmrip-video-set-deblock" role="function"/>ogmrip_video_set_deblock () -ogmrip_video_set_deblockvoid ogmrip_video_set_deblock (OGMRipVideo *video, - gboolean deblock); - -Sets whether to apply a deblocking filter. - - - -video : - an OGMRipVideo - -deblock : - TRUE to apply a deblocking filter - - - -<anchor id="ogmrip-video-get-deinterlacer" role="function"/>ogmrip_video_get_deinterlacer () -ogmrip_video_get_deinterlacergint ogmrip_video_get_deinterlacer (OGMRipVideo *video); - -Gets the currnet deinterlacer. - - - -video : - an OGMRipVideo - -Returns : the deinterlacer, or -1 - - - -<anchor id="ogmrip-video-set-deinterlacer" role="function"/>ogmrip_video_set_deinterlacer () -ogmrip_video_set_deinterlacervoid ogmrip_video_set_deinterlacer (OGMRipVideo *video, - OGMRipDeintType deint); - -Sets the deinterlacer to be used. - - - -video : - an OGMRipVideo - -deint : - an OGMRipDeintType - - - -<anchor id="ogmrip-video-get-denoise" role="function"/>ogmrip_video_get_denoise () -ogmrip_video_get_denoisegboolean ogmrip_video_get_denoise (OGMRipVideo *video); - -Gets whether to reduce image noise. - - - -video : - an OGMRipVideo - -Returns : TRUE to reduce image noise - - - -<anchor id="ogmrip-video-set-denoise" role="function"/>ogmrip_video_set_denoise () -ogmrip_video_set_denoisevoid ogmrip_video_set_denoise (OGMRipVideo *video, - gboolean denoise); - -Sets whether to reduce image noise. - - - -video : - an OGMRipVideo - -denoise : - TRUE to reduce image noise - - - -<anchor id="ogmrip-video-get-dering" role="function"/>ogmrip_video_get_dering () -ogmrip_video_get_deringgboolean ogmrip_video_get_dering (OGMRipVideo *video); - -Gets whether a deringing filter will be applied. - - - -video : - an OGMRipVideo - -Returns : TRUE if a deringing filter will be applied - - - -<anchor id="ogmrip-video-set-dering" role="function"/>ogmrip_video_set_dering () -ogmrip_video_set_deringvoid ogmrip_video_set_dering (OGMRipVideo *video, - gboolean dering); - -Sets whether to apply a deringing filter. - - - -video : - an OGMRipVideo - -dering : - TRUE to apply a deringing filter - - - -<anchor id="ogmrip-video-get-ensure-sync" role="function"/>ogmrip_video_get_ensure_sync () -ogmrip_video_get_ensure_syncOGMDvdAudioStream* ogmrip_video_get_ensure_sync (OGMRipVideo *video); - -Gets the audio stream that will be encoded along with the video to ensure -the A/V synchronization. - - - -video : - an OGMRipVideo - -Returns : the OGMDvdAudioStream, or NULL - - - -<anchor id="ogmrip-video-set-ensure-sync" role="function"/>ogmrip_video_set_ensure_sync () -ogmrip_video_set_ensure_syncvoid ogmrip_video_set_ensure_sync (OGMRipVideo *video, - OGMDvdAudioStream *stream); - -Sets the audio stream that will be encoded along with the video to ensure -the A/V synchronization. - - - -video : - an OGMRipVideo - -stream : - an OGMDvdAudioStream - - - -<anchor id="ogmrip-video-get-grayscale" role="function"/>ogmrip_video_get_grayscale () -ogmrip_video_get_grayscalegboolean ogmrip_video_get_grayscale (OGMRipVideo *video); - -Gets whether the movie is grayscale. - - - -video : - an OGMRipVideo - -Returns : TRUE if movie is grayscale - - - -<anchor id="ogmrip-video-set-grayscale" role="function"/>ogmrip_video_set_grayscale () -ogmrip_video_set_grayscalevoid ogmrip_video_set_grayscale (OGMRipVideo *video, - gboolean grayscale); - -Sets whether the movie is grayscale. - - - -video : - an OGMRipVideo - -grayscale : - TRUE if movie is grayscale - - - -<anchor id="ogmrip-video-get-log" role="function"/>ogmrip_video_get_log () -ogmrip_video_get_loggchar* ogmrip_video_get_log (OGMRipVideo *video); - -Gets the name of the file in which to dump first path information. - - - -video : - an OGMRipVideo - -Returns : the filename, or NULL - - - -<anchor id="ogmrip-video-set-log" role="function"/>ogmrip_video_set_log () -ogmrip_video_set_logvoid ogmrip_video_set_log (OGMRipVideo *video, - const gchar *log); - -Sets the name of the file in which to dump first path information. - - - -video : - an OGMRipVideo - -log : - the name of the log file - - - -<anchor id="ogmrip-video-get-max-b-frames" role="function"/>ogmrip_video_get_max_b_frames () -ogmrip_video_get_max_b_framesgint ogmrip_video_get_max_b_frames (OGMRipVideo *video); - -Gets the maximum number of B-frames to put between I/P-frames. - - - -video : - an OGMRipVideo - -Returns : the maximum number of B-frames, or -1 - - - -<anchor id="ogmrip-video-set-max-b-frames" role="function"/>ogmrip_video_set_max_b_frames () -ogmrip_video_set_max_b_framesvoid ogmrip_video_set_max_b_frames (OGMRipVideo *video, - guint max_b_frames); - -Sets the maximum number of B-frames to put between I/P-frames. - - - -video : - an OGMRipVideo - -max_b_frames : - the maximum number of B-frames - - - -<anchor id="ogmrip-video-get-pass" role="function"/>ogmrip_video_get_pass () -ogmrip_video_get_passgint ogmrip_video_get_pass (OGMRipVideo *video); - -Gets the current pass number. - - - -video : - an OGMRipVideo - -Returns : the pass number, or -1 - - - -<anchor id="ogmrip-video-set-pass" role="function"/>ogmrip_video_set_pass () -ogmrip_video_set_passvoid ogmrip_video_set_pass (OGMRipVideo *video, - guint pass); - -Sets the pass number of the encoding. - - - -video : - an OGMRipVideo - -pass : - the pass number - - - -<anchor id="ogmrip-video-get-pullup" role="function"/>ogmrip_video_get_pullup () -ogmrip_video_get_pullupgboolean ogmrip_video_get_pullup (OGMRipVideo *video); - -Gets whether an inverse telecine filter will be applied - - - -video : - an OGMRipVideo - -Returns : TRUE if inverse telecine - - - -<anchor id="ogmrip-video-set-pullup" role="function"/>ogmrip_video_set_pullup () -ogmrip_video_set_pullupvoid ogmrip_video_set_pullup (OGMRipVideo *video, - gboolean pullup); - -Sets whether an inverse telecine filter will be applied - - - -video : - an OGMRipVideo - -pullup : - TRUE to inverse telecine - - - -<anchor id="ogmrip-video-get-qpel" role="function"/>ogmrip_video_get_qpel () -ogmrip_video_get_qpelgboolean ogmrip_video_get_qpel (OGMRipVideo *video); - -Sets whether quarter pel motion compensation is used. - - - -video : - an OGMRipVideo - -Returns : TRUE if quarter pel motion compensation is used - - - -<anchor id="ogmrip-video-set-qpel" role="function"/>ogmrip_video_set_qpel () -ogmrip_video_set_qpelvoid ogmrip_video_set_qpel (OGMRipVideo *video, - gboolean qpel); - -Sets whether to use quarter pel motion compensation. - - - -video : - an OGMRipVideo - -qpel : - TRUE to use quarter pel motion compensation - - - -<anchor id="ogmrip-video-get-quality" role="function"/>ogmrip_video_get_quality () -ogmrip_video_get_qualitygint ogmrip_video_get_quality (OGMRipVideo *video); - -Gets the quality of the encoding. - - - -video : - an OGMRipVideo - -Returns : the OGMRipQualityType, or -1 - - - -<anchor id="ogmrip-video-set-quality" role="function"/>ogmrip_video_set_quality () -ogmrip_video_set_qualityvoid ogmrip_video_set_quality (OGMRipVideo *video, - OGMRipQualityType quality); - -Sets the quality of the encoding. - - - -video : - an OGMRipVideo - -quality : - the OGMRipQualityType - - - -<anchor id="ogmrip-video-get-quantizer" role="function"/>ogmrip_video_get_quantizer () -ogmrip_video_get_quantizergdouble ogmrip_video_get_quantizer (OGMRipVideo *video); - -Gets the video quantizer. - - - -video : - an OGMRipVideo - -Returns : the video quantizer, or -1 - - - -<anchor id="ogmrip-video-set-quantizer" role="function"/>ogmrip_video_set_quantizer () -ogmrip_video_set_quantizervoid ogmrip_video_set_quantizer (OGMRipVideo *video, - gdouble quantizer); - -Sets the video quantizer to be used, 1 being the lowest and 31 the highest -available quantizers. - - - -video : - an OGMRipVideo - -quantizer : - the video quantizer - - - -<anchor id="ogmrip-video-get-raw-size" role="function"/>ogmrip_video_get_raw_size () -ogmrip_video_get_raw_sizevoid ogmrip_video_get_raw_size (OGMRipVideo *video, - guint *width, - guint *height); - -Gets the raw size of the video. - - - -video : - an OGMRipVideo - -width : - a pointer to store the width - -height : - a pointer to store the height - - - -<anchor id="ogmrip-video-get-scale-size" role="function"/>ogmrip_video_get_scale_size () -ogmrip_video_get_scale_sizegboolean ogmrip_video_get_scale_size (OGMRipVideo *video, - guint *width, - guint *height); - -Gets whether the video will be scaled and the scale size. - - - -video : - an OGMRipVideo - -width : - a pointer to store the scaled width - -height : - a pointer to store the scaled height - -Returns : TRUE if the video will be scaled - - - -<anchor id="ogmrip-video-set-scale-size" role="function"/>ogmrip_video_set_scale_size () -ogmrip_video_set_scale_sizevoid ogmrip_video_set_scale_size (OGMRipVideo *video, - guint width, - guint height); - -Sets the scaled size of the movie. - - - -video : - an OGMRipVideo - -width : - the scaled width - -height : - the scaled height - - - -<anchor id="ogmrip-video-get-scaler" role="function"/>ogmrip_video_get_scaler () -ogmrip_video_get_scalergint ogmrip_video_get_scaler (OGMRipVideo *video); - -Gets the current software scaler. - - - -video : - an OGMRipVideo - -Returns : the software scaler, or -1 - - - -<anchor id="ogmrip-video-set-scaler" role="function"/>ogmrip_video_set_scaler () -ogmrip_video_set_scalervoid ogmrip_video_set_scaler (OGMRipVideo *video, - OGMRipScalerType scaler); - -Sets the software scaler to be used. - - - -video : - an OGMRipVideo - -scaler : - an OGMRipScalerType - - - -<anchor id="ogmrip-video-get-threads" role="function"/>ogmrip_video_get_threads () -ogmrip_video_get_threadsgint ogmrip_video_get_threads (OGMRipVideo *video); - -Gets the number of threads. - - - -video : - an OGMRipVideo - -Returns : the number of threads, or -1 - - - -<anchor id="ogmrip-video-set-threads" role="function"/>ogmrip_video_set_threads () -ogmrip_video_set_threadsvoid ogmrip_video_set_threads (OGMRipVideo *video, - guint threads); - -Sets the number of threads to be used. - - - -video : - an OGMRipVideo - -threads : - the number of threads - - - -<anchor id="ogmrip-video-get-trellis" role="function"/>ogmrip_video_get_trellis () -ogmrip_video_get_trellisgboolean ogmrip_video_get_trellis (OGMRipVideo *video); - -Gets whether trellis quantization is enabled. - - - -video : - an OGMRipVideo - -Returns : TRUE if trellis quantization is enabled - - - -<anchor id="ogmrip-video-set-trellis" role="function"/>ogmrip_video_set_trellis () -ogmrip_video_set_trellisvoid ogmrip_video_set_trellis (OGMRipVideo *video, - gboolean trellis); - -Sets whether trellis quantization will be enabled. - - - -video : - an OGMRipVideo - -trellis : - TRUE to enable trellis quantization - - - -<anchor id="ogmrip-video-get-turbo" role="function"/>ogmrip_video_get_turbo () -ogmrip_video_get_turbogboolean ogmrip_video_get_turbo (OGMRipVideo *video); - -Gets whether turbo is enabled. - - - -video : - an OGMRipVideo - -Returns : TRUE if turbo is enabled - - - -<anchor id="ogmrip-video-set-turbo" role="function"/>ogmrip_video_set_turbo () -ogmrip_video_set_turbovoid ogmrip_video_set_turbo (OGMRipVideo *video, - gboolean turbo); - -Sets whether to enable turbo. - - - -video : - an OGMRipVideo - -turbo : - TRUE to enable turbo - - - - - - - - - diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-vobsub.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-vobsub.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-vobsub.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-vobsub.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipVobSub +OGMRipVobSub 3 OGMRIP Library @@ -15,17 +15,13 @@ - + Synopsis - - - OGMRipVobSub; OGMJobSpawn* ogmrip_vobsub_new (OGMDvdSubpStream *subp, const gchar *output); - @@ -37,29 +33,27 @@ - + Description - + Details - -<anchor id="OGMRipVobSub" role="struct"/>OGMRipVobSub -OGMRipVobSubtypedef struct { - OGMRipSubp parent_instance; - - OGMRipVobSubPriv *priv; + +OGMRipVobSub +OGMRipVobSubtypedef struct { + OGMRipSubpCodec parent_instance; } OGMRipVobSub; - -<anchor id="ogmrip-vobsub-new" role="function"/>ogmrip_vobsub_new () -ogmrip_vobsub_newOGMJobSpawn* ogmrip_vobsub_new (OGMDvdSubpStream *subp, + +ogmrip_vobsub_new () +ogmrip_vobsub_newOGMJobSpawn* ogmrip_vobsub_new (OGMDvdSubpStream *subp, const gchar *output); Creates a new OGMRipVobSub. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-vorbis.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-vorbis.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-vorbis.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-vorbis.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipVorbis +OGMRipVorbis 3 OGMRIP Library @@ -15,17 +15,13 @@ - + Synopsis - - - OGMRipVorbis; OGMJobSpawn* ogmrip_vorbis_new (OGMDvdAudioStream *audio, const gchar *output); - @@ -37,29 +33,27 @@ - + Description - + Details - -<anchor id="OGMRipVorbis" role="struct"/>OGMRipVorbis -OGMRipVorbistypedef struct { - OGMRipAudio parent_instance; - - OGMRipVorbisPriv *priv; + +OGMRipVorbis +OGMRipVorbistypedef struct { + OGMRipAudioCodec parent_instance; } OGMRipVorbis; - -<anchor id="ogmrip-vorbis-new" role="function"/>ogmrip_vorbis_new () -ogmrip_vorbis_newOGMJobSpawn* ogmrip_vorbis_new (OGMDvdAudioStream *audio, + +ogmrip_vorbis_new () +ogmrip_vorbis_newOGMJobSpawn* ogmrip_vorbis_new (OGMDvdAudioStream *audio, const gchar *output); Creates a new OGMRipVorbis. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-wav.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-wav.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-wav.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-wav.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipWav +OGMRipWav 3 OGMRIP Library @@ -15,20 +15,16 @@ - + Synopsis - - - OGMRipWav; OGMJobSpawn* ogmrip_wav_new (OGMDvdAudioStream *audio, const gchar *output); void ogmrip_wav_set_header (OGMRipWav *wav, gboolean header); gboolean ogmrip_wav_get_header (OGMRipWav *wav); - @@ -40,19 +36,19 @@ - + Description - + Details - -<anchor id="OGMRipWav" role="struct"/>OGMRipWav -OGMRipWavtypedef struct { - OGMRipAudio parent_instance; + +OGMRipWav +OGMRipWavtypedef struct { + OGMRipAudioCodec parent_instance; OGMRipWavPriv *priv; } OGMRipWav; @@ -60,9 +56,9 @@ - -<anchor id="ogmrip-wav-new" role="function"/>ogmrip_wav_new () -ogmrip_wav_newOGMJobSpawn* ogmrip_wav_new (OGMDvdAudioStream *audio, + +ogmrip_wav_new () +ogmrip_wav_newOGMJobSpawn* ogmrip_wav_new (OGMDvdAudioStream *audio, const gchar *output); Creates a new OGMRipWav @@ -78,9 +74,9 @@ Returns : The new OGMRipWav - -<anchor id="ogmrip-wav-set-header" role="function"/>ogmrip_wav_set_header () -ogmrip_wav_set_headervoid ogmrip_wav_set_header (OGMRipWav *wav, + +ogmrip_wav_set_header () +ogmrip_wav_set_headervoid ogmrip_wav_set_header (OGMRipWav *wav, gboolean header); Sets whether to include the wave header. @@ -94,9 +90,9 @@ TRUE to have the header - -<anchor id="ogmrip-wav-get-header" role="function"/>ogmrip_wav_get_header () -ogmrip_wav_get_headergboolean ogmrip_wav_get_header (OGMRipWav *wav); + +ogmrip_wav_get_header () +ogmrip_wav_get_headergboolean ogmrip_wav_get_header (OGMRipWav *wav); Gets whether to include the wave header. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-x264.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-x264.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-x264.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-x264.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipX264 +OGMRipX264 3 OGMRIP Library @@ -15,17 +15,13 @@ - + Synopsis - - - OGMRipX264; OGMJobSpawn* ogmrip_x264_new (OGMDvdTitle *title, const gchar *output); - @@ -37,19 +33,19 @@ - + Description - + Details - -<anchor id="OGMRipX264" role="struct"/>OGMRipX264 -OGMRipX264typedef struct { - OGMRipVideo parent_instance; + +OGMRipX264 +OGMRipX264typedef struct { + OGMRipVideoCodec parent_instance; OGMRipX264Priv *priv; } OGMRipX264; @@ -57,9 +53,9 @@ - -<anchor id="ogmrip-x264-new" role="function"/>ogmrip_x264_new () -ogmrip_x264_newOGMJobSpawn* ogmrip_x264_new (OGMDvdTitle *title, + +ogmrip_x264_new () +ogmrip_x264_newOGMJobSpawn* ogmrip_x264_new (OGMDvdTitle *title, const gchar *output); Creates a new OGMRipX264. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-xvid.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-xvid.xml --- ogmrip-0.11.1/docs/reference/ogmrip/xml/ogmrip-xvid.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip/xml/ogmrip-xvid.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipXvid +OGMRipXvid 3 OGMRIP Library @@ -15,20 +15,16 @@ - + Synopsis - - - OGMRipXvid; OGMJobSpawn* ogmrip_xvid_new (OGMDvdTitle *title, const gchar *output); void ogmrip_xvid_set_gmc (OGMRipXvid *xvid, gboolean gmc); gboolean ogmrip_xvid_get_gmc (OGMRipXvid *xvid); - @@ -40,19 +36,19 @@ - + Description - + Details - -<anchor id="OGMRipXvid" role="struct"/>OGMRipXvid -OGMRipXvidtypedef struct { - OGMRipVideo parent_instance; + +OGMRipXvid +OGMRipXvidtypedef struct { + OGMRipVideoCodec parent_instance; OGMRipXvidPriv *priv; } OGMRipXvid; @@ -60,9 +56,9 @@ - -<anchor id="ogmrip-xvid-new" role="function"/>ogmrip_xvid_new () -ogmrip_xvid_newOGMJobSpawn* ogmrip_xvid_new (OGMDvdTitle *title, + +ogmrip_xvid_new () +ogmrip_xvid_newOGMJobSpawn* ogmrip_xvid_new (OGMDvdTitle *title, const gchar *output); Creates a new OGMRipXvid. @@ -78,9 +74,9 @@ Returns : the new OGMRipXvid - -<anchor id="ogmrip-xvid-set-gmc" role="function"/>ogmrip_xvid_set_gmc () -ogmrip_xvid_set_gmcvoid ogmrip_xvid_set_gmc (OGMRipXvid *xvid, + +ogmrip_xvid_set_gmc () +ogmrip_xvid_set_gmcvoid ogmrip_xvid_set_gmc (OGMRipXvid *xvid, gboolean gmc); Enables global motion compensation. @@ -94,9 +90,9 @@ TRUE to set global motion compensation - -<anchor id="ogmrip-xvid-get-gmc" role="function"/>ogmrip_xvid_get_gmc () -ogmrip_xvid_get_gmcgboolean ogmrip_xvid_get_gmc (OGMRipXvid *xvid); + +ogmrip_xvid_get_gmc () +ogmrip_xvid_get_gmcgboolean ogmrip_xvid_get_gmc (OGMRipXvid *xvid); Gets global motion compensation. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/chapters.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/chapters.html --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/chapters.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/chapters.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + Chapters - + - + - + - - + + @@ -27,8 +27,11 @@

Chapters

-OGMRipChapterList — A widget that lists the chapters of a DVD title +OGMRipChapterList — A widget that lists the chapters of a DVD title
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/choosers.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/choosers.html --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/choosers.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/choosers.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + Choosers - + - - + + - + - - + + @@ -28,15 +28,18 @@ Choosers
-OGMRipSourceChooser — Source chooser interface used by OGMRipSourceChooserWidget +OGMRipSourceChooser — Source chooser interface used by OGMRipSourceChooserWidget
-OGMRipSourceChooserWidget — Source chooser widget that can be embedded in other widgets +OGMRipSourceChooserWidget — Source chooser widget that can be embedded in other widgets
-OGMRipChooserList — A widget that displays a list of source choosers +OGMRipChooserList — A widget that displays a list of source choosers
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/index.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/index.html --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/index.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/index.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,19 +1,20 @@ - + OGMRip Gtk+ Reference Manual - + - - + + - - + + -
+ +
@@ -25,10 +26,10 @@
I. OGMRip Gtk+ Core Reference
-Helper — A list of helper functions +Helper — A list of helper functions
-Preferences — Functions to manage preferences +Preferences — Functions to manage preferences
II. OGMRip Gtk+ Library Reference
@@ -36,20 +37,24 @@
Choosers
-OGMRipSourceChooser — Source chooser interface used by OGMRipSourceChooserWidget +OGMRipSourceChooser — Source chooser interface used by OGMRipSourceChooserWidget
-OGMRipSourceChooserWidget — Source chooser widget that can be embedded in other widgets +OGMRipSourceChooserWidget — Source chooser widget that can be embedded in other widgets
-OGMRipChooserList — A widget that displays a list of source choosers +OGMRipChooserList — A widget that displays a list of source choosers
Chapters
-OGMRipChapterList — A widget that lists the chapters of a DVD title +OGMRipChapterList — A widget that lists the chapters of a DVD title
-
+
+
+
+ Generated by GTK-Doc V1.10
+ diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/index.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/index.sgml --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/index.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/index.sgml 2008-09-28 19:28:17.000000000 +0200 @@ -1,4 +1,7 @@ + + + @@ -14,13 +17,19 @@ + + + + + + @@ -39,27 +48,45 @@ + + + + + + + + + + + + - - - - + + + + + + + + + + @@ -69,11 +96,20 @@ + + + + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/OGMRipChapterList.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/OGMRipChapterList.html --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/OGMRipChapterList.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/OGMRipChapterList.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,16 +1,16 @@ - + OGMRipChapterList - + - + - - + + @@ -21,58 +21,53 @@ Up Home OGMRip Gtk+ Reference Manual -  +  -Top -  |  - Description -  |  - Object Hierarchy -  |  - Implemented Interfaces -  |  - Signals +Top +  |  + Description +  |  + Object Hierarchy +  |  + Implemented Interfaces +  |  + Signals
-

-OGMRipChapterList -

-

OGMRipChapterList — A widget that lists the chapters of a DVD title

+

OGMRipChapterList

+

OGMRipChapterList — A widget that lists the chapters of a DVD title
-

Synopsis

+

Synopsis

 
 #include <ogmrip-chapter-list.h>
 
-
-                    OGMRipChapterList;
+                    OGMRipChapterList;
 GtkWidget*          ogmrip_chapter_list_new             (void);
-void                ogmrip_chapter_list_select_all      (OGMRipChapterList *list);
-void                ogmrip_chapter_list_deselect_all    (OGMRipChapterList *list);
+>GtkWidget*          ogmrip_chapter_list_new             (void);
+void                ogmrip_chapter_list_select_all      (OGMRipChapterList *list);
+void                ogmrip_chapter_list_deselect_all    (OGMRipChapterList *list);
 gboolean            ogmrip_chapter_list_get_selected    (OGMRipChapterList *list,
+>gboolean            ogmrip_chapter_list_get_selected    (OGMRipChapterList *list,
                                                          guint *start_chapter,
                                                          gint *end_chapter);
-
-

Object Hierarchy

+

Object Hierarchy

-
   GObject
@@ -92,13 +87,13 @@
 href="/usr/share/gtk-doc/html/gtk/GtkTreeView.html"
 >GtkTreeView
                                  +----OGMDvdChapterList
                                        +----OGMRipChapterList
-

Implemented Interfaces

+

Implemented Interfaces

OGMRipChapterList implements AtkImplementorIface and GtkBuildable.

-

Signals

+

Signals

-
-  "selection-changed"                              : Run Last / No Recursion / No Hooks
+  "selection-changed"                              : Run Last / No Recursion / No Hooks
-

Description

+

Description

@@ -121,41 +115,38 @@

-

Details

+

Details

-

-OGMRipChapterList

-
typedef struct _OGMRipChapterList OGMRipChapterList;
+

OGMRipChapterList

+
typedef struct _OGMRipChapterList OGMRipChapterList;

-

-ogmrip_chapter_list_new ()

-
ogmrip_chapter_list_new ()

+
GtkWidget*          ogmrip_chapter_list_new             (void);

 

-Creates a new OGMRipChapterList.

+Creates a new OGMRipChapterList.

 

 
 

 

-
-
+

 
 
Returns : The new OGMRipChapterList
+
Returns :
 The new OGMRipChapterList
-

-ogmrip_chapter_list_select_all ()

-
void                ogmrip_chapter_list_select_all      (OGMRipChapterList *list);
+

ogmrip_chapter_list_select_all ()

+
void                ogmrip_chapter_list_select_all      (OGMRipChapterList *list);

Select all the chapters of the list.

@@ -164,17 +155,16 @@

- - +
list : An OGMRipChapterList +

list :

 An OGMRipChapterList
-

-ogmrip_chapter_list_deselect_all ()

-
void                ogmrip_chapter_list_deselect_all    (OGMRipChapterList *list);
+

ogmrip_chapter_list_deselect_all ()

+
void                ogmrip_chapter_list_deselect_all    (OGMRipChapterList *list);

Deselects all the chapters of the list.

@@ -183,19 +173,18 @@

- - +
list : An OGMRipChapterList +

list :

 An OGMRipChapterList
-

-ogmrip_chapter_list_get_selected ()

-
ogmrip_chapter_list_get_selected ()

+
gboolean            ogmrip_chapter_list_get_selected    (OGMRipChapterList *list,
+>gboolean            ogmrip_chapter_list_get_selected    (OGMRipChapterList *list,
                                                          guint *start_chapter,
@@ -211,22 +200,22 @@
 
 
 
-list :
- An OGMRipChapterList
+
list :

+ An OGMRipChapterList
 
 
 
-start_chapter :
+
start_chapter :

  The first selected chapter
 
 
 
-end_chapter :
+
end_chapter :

  The last selected chapter
 
 
 
-Returns :
+
Returns :

  TRUE, if start_chapter and end_chapter were set
@@ -237,11 +226,10 @@
-

Signal Details

+

Signal Details

-

-The "selection-changed" signal

-
void                user_function                      (OGMRipChapterList *list,
+
The "selection-changed" signal

+
void                user_function                      (OGMRipChapterList *list,
                                                         gpointer           user_data)      : Run Last / No Recursion / No Hooks

@@ -254,12 +242,12 @@
 
 
 
-list :
+
list :

  the widget that received the signal
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -267,5 +255,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/OGMRipChooserList.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/OGMRipChooserList.html --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/OGMRipChooserList.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/OGMRipChooserList.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + OGMRipChooserList - + - + - - + + @@ -24,72 +24,70 @@ OGMRip Gtk+ Reference Manual Next -Top -  |  - Description -  |  - Object Hierarchy -  |  - Implemented Interfaces -  |  - Signals +Top +  |  + Description +  |  + Object Hierarchy +  |  + Implemented Interfaces +  |  + Signals
-

-OGMRipChooserList -

-

OGMRipChooserList — A widget that displays a list of source choosers

+

OGMRipChooserList

+

OGMRipChooserList — A widget that displays a list of source choosers
-

Synopsis

+

Synopsis

 
 #include <ogmrip-chooser-list.h>
 
-
-                    OGMRipChooserListPriv;
-                    OGMRipChooserList;
+                    OGMRipChooserListPriv;
+                    OGMRipChooserList;
 GtkWidget*          ogmrip_chooser_list_new             (GtkWidget*          ogmrip_chooser_list_new             (GType type);
-void                ogmrip_chooser_list_set_max         (OGMRipChooserList *list,
+void                ogmrip_chooser_list_set_max         (OGMRipChooserList *list,
                                                          guint max);
 gint                ogmrip_chooser_list_get_max         (OGMRipChooserList *list);
-void                ogmrip_chooser_list_clear           (OGMRipChooserList *list);
-void                ogmrip_chooser_list_add             (OGMRipChooserList *list,
+>gint                ogmrip_chooser_list_get_max         (OGMRipChooserList *list);
+void                ogmrip_chooser_list_clear           (OGMRipChooserList *list);
+void                ogmrip_chooser_list_add             (OGMRipChooserList *list,
                                                          GtkWidget *chooser);
-void                ogmrip_chooser_list_remove          (OGMRipChooserList *list,
+void                ogmrip_chooser_list_remove          (OGMRipChooserList *list,
                                                          GtkWidget *chooser);
-void                ogmrip_chooser_list_foreach         (OGMRipChooserList *list,
-                                                         OGMRipSourceType type,
+void                ogmrip_chooser_list_foreach         (OGMRipChooserList *list,
+                                                         OGMRipSourceType type,
                                                          GFunc func,
                                                          gpointer data);
-
+gint                ogmrip_chooser_list_get_n_children  (OGMRipChooserList *list);
-

Object Hierarchy

+

Object Hierarchy

-
   GObject
@@ -115,7 +113,7 @@
-

Implemented Interfaces

+

Implemented Interfaces

OGMRipChooserList implements AtkImplementorIface and GtkBuildable.

-

Signals

+

Signals

-
-  "more-clicked"                                   : Run Last / No Recursion / No Hooks
+  "more-clicked"                                   : Run Last / No Recursion / No Hooks
-

Description

+

Description

@@ -138,35 +135,32 @@

-

Details

+

Details

-

-OGMRipChooserListPriv

-
typedef struct _OGMRipChooserListPriv OGMRipChooserListPriv;
+

OGMRipChooserListPriv

+
typedef struct _OGMRipChooserListPriv OGMRipChooserListPriv;

-

-OGMRipChooserList

-
typedef struct _OGMRipChooserList OGMRipChooserList;
+

OGMRipChooserList

+
typedef struct _OGMRipChooserList OGMRipChooserList;

-

-ogmrip_chooser_list_new ()

-
ogmrip_chooser_list_new ()

+
GtkWidget*          ogmrip_chooser_list_new             (GType type);

 

-Creates a new OGMRipChooserList.

+Creates a new OGMRipChooserList.

 

 
 

@@ -174,13 +168,13 @@
 
 
 
-type :
+
type :

  the type of the children
 
 
 
-Returns :
- The new OGMRipChooserList
+
Returns :

+ The new OGMRipChooserList
 
 
 
@@ -188,14 +182,13 @@
-

-ogmrip_chooser_list_set_max ()

-
void                ogmrip_chooser_list_set_max         (OGMRipChooserList *list,
+
ogmrip_chooser_list_set_max ()

+
void                ogmrip_chooser_list_set_max         (OGMRipChooserList *list,
                                                          guint max);

 

-Creates a new OGMRipChooserList.

+Creates a new OGMRipChooserList.

 

 
 

@@ -203,12 +196,12 @@
 
 
 
-list :
- An OGMRipChooserList
+
list :

+ An OGMRipChooserList
 
 
 
-max :
+
max :

  the maximum number of children
 
 
@@ -217,11 +210,10 @@
-

-ogmrip_chooser_list_get_max ()

-
ogmrip_chooser_list_get_max ()

+
gint                ogmrip_chooser_list_get_max         (OGMRipChooserList *list);

+>gint                ogmrip_chooser_list_get_max         (OGMRipChooserList *list);

Returns the maximum number of children.

@@ -231,12 +223,12 @@ -list : - An OGMRipChooserList +

list :

+ An OGMRipChooserList -Returns : +

Returns :

the maximum number of children, or -1 @@ -245,9 +237,8 @@
-

-ogmrip_chooser_list_clear ()

-
void                ogmrip_chooser_list_clear           (OGMRipChooserList *list);
+

ogmrip_chooser_list_clear ()

+
void                ogmrip_chooser_list_clear           (OGMRipChooserList *list);

Removes all children of list.

@@ -256,17 +247,16 @@

- - +
list : An OGMRipChooserList +

list :

 An OGMRipChooserList
-

-ogmrip_chooser_list_add ()

-
void                ogmrip_chooser_list_add             (OGMRipChooserList *list,
+
ogmrip_chooser_list_add ()

+
void                ogmrip_chooser_list_add             (OGMRipChooserList *list,
                                                          GtkWidget *chooser);

@@ -279,12 +269,12 @@
 
 
 
-list :
- An OGMRipChooserList
+
list :

+ An OGMRipChooserList
 
 
 
-chooser :
+
chooser :

  A chooser to be placed inside list
 
 
@@ -293,9 +283,8 @@
-

-ogmrip_chooser_list_remove ()

-
void                ogmrip_chooser_list_remove          (OGMRipChooserList *list,
+
ogmrip_chooser_list_remove ()

+
void                ogmrip_chooser_list_remove          (OGMRipChooserList *list,
                                                          GtkWidget *chooser);

@@ -308,13 +297,13 @@
 
 
 
-list :
- An OGMRipChooserList
+
list :

+ An OGMRipChooserList
 
 
 
-chooser :
- Â current child of list
+
chooser :

+ Â current child of list
 
 
 
@@ -322,10 +311,9 @@
-

-ogmrip_chooser_list_foreach ()

-
void                ogmrip_chooser_list_foreach         (OGMRipChooserList *list,
-                                                         OGMRipSourceType type,
+
ogmrip_chooser_list_foreach ()

+
void                ogmrip_chooser_list_foreach         (OGMRipChooserList *list,
+                                                         OGMRipSourceType type,
                                                          GFunc func,
@@ -341,36 +329,62 @@
 
 
 
-list :
- An OGMRipChooserList
+
list :

+ An OGMRipChooserList
 
 
 
-type :
+
type :

  The type of the children
 
 
 
-func :
+
func :

  A callback
 
 
 
-data :
+
data :

  Callback user data
+
+
+

ogmrip_chooser_list_get_n_children ()

+
gint                ogmrip_chooser_list_get_n_children  (OGMRipChooserList *list);
+

+Returns the number of valid source choosers contained in list.

+

+ +

+
++ + + + + + + + + + +

list :

 An OGMRipChooserList +

Returns :

 The number of valid choosers, or -1 +
+
-

Signal Details

+

Signal Details

-

-The "more-clicked" signal

-
void                user_function                      (OGMRipChooserList   *list,
-                                                        OGMRipSourceChooser *chooser,
+
The "more-clicked" signal

+
void                user_function                      (OGMRipChooserList   *list,
+                                                        OGMRipSourceChooser *chooser,
                                                         gpointer             user_data)      : Run Last / No Recursion / No Hooks

@@ -383,17 +397,17 @@
 
 
 
-list :
+
list :

  the widget that received the signal
 
 
 
-chooser :
+
chooser :

  the selected source chooser
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -401,5 +415,8 @@
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk.devhelp /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk.devhelp --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk.devhelp 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk.devhelp 2008-09-28 19:28:17.000000000 +0200 @@ -37,8 +37,11 @@ + + + @@ -57,6 +60,12 @@ + + + + + + @@ -79,6 +88,7 @@ + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk.devhelp2 /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk.devhelp2 --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk.devhelp2 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk.devhelp2 2008-09-28 19:28:17.000000000 +0200 @@ -37,8 +37,11 @@ + + + @@ -57,6 +60,12 @@ + + + + + + @@ -79,6 +88,7 @@ + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk-lib.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk-lib.html --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk-lib.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk-lib.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,36 +1,60 @@ - -Part II. OGMRip Gtk+ Library Reference - + +Part II. OGMRip Gtk+ Library Reference + - + - - + + - +

-Part II. OGMRip Gtk+ Library Reference

+Part II. OGMRip Gtk+ Library Reference

This section contains the API reference for OGMRip Gtk+. All the public interfaces are documented here.

+
+

Table of Contents

+
+
Choosers
+
+
+OGMRipSourceChooser — Source chooser interface used by OGMRipSourceChooserWidget +
+
+OGMRipSourceChooserWidget — Source chooser widget that can be embedded in other widgets +
+
+OGMRipChooserList — A widget that displays a list of source choosers +
+
+
Chapters
+
+OGMRipChapterList — A widget that lists the chapters of a DVD title +
+
+ +
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ogmrip-helper.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ogmrip-helper.html --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ogmrip-helper.html 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ogmrip-helper.html 2008-09-28 19:28:17.000000000 +0200 @@ -1,17 +1,17 @@ - + Helper - + - - + + - + - - + + @@ -24,42 +24,39 @@ OGMRip Gtk+ Reference Manual Next -Top -  |  - Description +Top +  |  + Description
-

-Helper -

-

Helper — A list of helper functions

+

Helper

+

Helper — A list of helper functions
-

Synopsis

+

Synopsis

 
 #include <ogmrip-source-chooser.h>
 
-
-#define             GTK_BOX_CHILD                       (b)
-#define             OGMRIP_ERROR
+#define             GTK_BOX_CHILD                       (b)
+#define             OGMRIP_ERROR
 gchar*              g_get_locale                        (gchar*              g_get_locale                        (gint category);
-void                gtk_window_set_parent               (gtk_window_set_parent               (GtkWindow *window,
                                                          GtkWindow *parent);
-void                gtk_window_set_icon_from_stock      (gtk_window_set_icon_from_stock      (GtkWindow *window,
                                                          const gchar *stock_id);
 GtkWidget*          gtk_button_new_with_image           (const GtkWidget*          gtk_button_new_with_image           (const gchar *text,
                                                          const gchar *stock_id);
 gint                gtk_radio_button_get_active         (gint                gtk_radio_button_get_active         (GtkRadioButton *radio);
-void                gtk_radio_button_set_active         (gtk_radio_button_set_active         (GtkRadioButton *radio,
                                                          guint index);
 gboolean            gtk_tree_model_iter_prev            (gboolean            gtk_tree_model_iter_prev            (GtkTreeModel *tree_model,
                                                          GtkTreeIter *iter);
-void                gtk_label_set_int                   (gtk_label_set_int                   (GtkLabel *label,
                                                          gint value);
 gint                gtk_label_get_int                   (gint                gtk_label_get_int                   (GtkLabel *label);
 GtkWidget*          gtk_box_get_nth_child               (GtkWidget*          gtk_box_get_nth_child               (GtkBox *box,
                                                          gint n);
 GtkWidget*          ogmrip_message_dialog_new           (GtkWidget*          ogmrip_message_dialog_new           (GtkWindow *parent,
                                                          gint                ogmrip_message_dialog               (gint                ogmrip_message_dialog               (GtkWindow *parent,
-

Description

+

Description

@@ -146,11 +143,10 @@

-

Details

+

Details

-

-GTK_BOX_CHILD()

-
#define GTK_BOX_CHILD(b) ((GtkBoxChild *) (b))
+
GTK_BOX_CHILD()

+
#define GTK_BOX_CHILD(b) ((GtkBoxChild *) (b))
 

 

 
@@ -158,7 +154,7 @@
 

-
+
-
+
-
+
@@ -208,9 +202,8 @@
 

-

-gtk_window_set_parent ()

-
void                gtk_window_set_parent               (
gtk_window_set_parent ()

+
void                gtk_window_set_parent               (GtkWindow *window,
                                                          
 

-
+
-
+
@@ -253,9 +246,8 @@
 
 

 

-

-gtk_window_set_icon_from_stock ()

-
void                gtk_window_set_icon_from_stock      (
gtk_window_set_icon_from_stock ()

+
void                gtk_window_set_icon_from_stock      (GtkWindow *window,
                                                          const 
 

-
+
-
+
@@ -286,9 +278,8 @@
 
 

 

-

-gtk_button_new_with_image ()

-
gtk_button_new_with_image ()

+
GtkWidget*          gtk_button_new_with_image           (const 
 

-
+
-
+
-
+
-
+
-
+
@@ -364,9 +354,8 @@
 
 

 

-

-gtk_radio_button_set_active ()

-
void                gtk_radio_button_set_active         (
gtk_radio_button_set_active ()

+
void                gtk_radio_button_set_active         (GtkRadioButton *radio,
                                                          
 

-
+
-
+
@@ -397,9 +386,8 @@
 
 

 

-

-gtk_tree_model_iter_prev ()

-
gtk_tree_model_iter_prev ()

+
gboolean            gtk_tree_model_iter_prev            (
 

-
+
-
+
-
+
-
+
-
+
@@ -479,9 +466,8 @@
 
 

 

-

-gtk_label_get_int ()

-
gtk_label_get_int ()

+
gint                gtk_label_get_int                   (
 

-
+
-
+
@@ -511,9 +497,8 @@
 
 

 

-

-gtk_box_get_nth_child ()

-
gtk_box_get_nth_child ()

+
GtkWidget*          gtk_box_get_nth_child               (
 

-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -671,5 +654,8 @@
 
 
 
+

+

+          Generated by GTK-Doc V1.10

 
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ogmrip-preferences.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ogmrip-preferences.html
--- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ogmrip-preferences.html	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ogmrip-preferences.html	2008-09-28 19:28:17.000000000 +0200
@@ -1,17 +1,17 @@
 
 
 
-
+
 Preferences
-
+
 
-
+
 
-
-
+
+
 
-
-
+
+
 
 
 
@@ -24,73 +24,90 @@
 
-
+

 
 
b :
b :

 
 
 
@@ -168,9 +164,8 @@
 
 

 

-

-OGMRIP_ERROR

-
#define OGMRIP_ERROR ogmrip_error_quark ()
+
OGMRIP_ERROR

+
#define OGMRIP_ERROR ogmrip_error_quark ()
 

 

 
@@ -178,9 +173,8 @@
 

 

 

-

-g_get_locale ()

-
g_get_locale ()

+
gchar*              g_get_locale                        (
 

 
category :
category :

  A pointer to store the type of the chooser
 
 

 
Returns :
Returns :

  The active OGMRipSource
 
 

 
 
 
window :
window :

  A GtkWindow
 
 

 
parent :
parent :

  The parent window
 
 

 
window :
window :

  A GtkWindow
 
 

 
stock_id :
stock_id :

  the name of the stock item
 
 

 
text :
text :

  The text you want the GtkLabel to hold
 
 

 
stock_id :
stock_id :

  the name of the stock item
 
 

 
Returns :
Returns :

  A new GtkButton
@@ -330,9 +321,8 @@
 
 

 

-

-gtk_radio_button_get_active ()

-
gtk_radio_button_get_active ()

+
gint                gtk_radio_button_get_active         (
 

 
radio :
radio :

  Any GtkRadioButton of the group
 
 

 
Returns :
Returns :

  An integer, or -1
 
 

 
radio :
radio :

  Any GtkRadioButton of the group
 
 

 
index :
index :

  The index of the active item
 
 

 
tree_model :
tree_model :

  A GtkTreeModel
 
 

 
iter :
iter :

  The GtkTreeIter
 
 

 
Returns :
Returns :

  TRUE, if iter has been changed to the previous node
@@ -444,9 +432,8 @@
 
 

 

-

-gtk_label_set_int ()

-
void                gtk_label_set_int                   (
gtk_label_set_int ()

+
void                gtk_label_set_int                   (GtkLabel *label,
                                                          
 

 
label :
label :

  A GtkLabel
 
 

 
value :
value :

  An integer
 
 

 
label :
label :

  A GtkLabel
 
 

 
Returns :
Returns :

  The value of the label widget
 
 

 
box :
box :

  A GtkBox
 
 

 
n :
n :

  The index of the desired child
 
 

 
Returns :
Returns :

  The nth GtkWidget, or NULL
@@ -553,9 +538,8 @@
 
 

 

-

-ogmrip_message_dialog_new ()

-
ogmrip_message_dialog_new ()

+
GtkWidget*          ogmrip_message_dialog_new           (
 

 
parent :
parent :

  A GtkWindow
 
 

 
type :
type :

  A GtkMessageType
 
 

 
format :
format :

  printf()-style format string, or NULL
 
 

 
... :
... :

  Arguments for format
 
 

 
Returns :
Returns :

  A new GtkMessageDialog
@@ -613,9 +597,8 @@
 
 

 

-

-ogmrip_message_dialog ()

-
ogmrip_message_dialog ()

+
gint                ogmrip_message_dialog               (
 

 
parent :
parent :

  A GtkWindow
 
 

 
type :
type :

  A GtkMessageType
 
 

 
format :
format :

  printf()-style format string, or NULL
 
 

 
... :
... :

  Arguments for format
 
 

 
Returns :
Returns :

  The response ID
 
 
OGMRip Gtk+ Reference Manual
 Next
 
Top
-                   | 
-                  Description
Top
+                   | 
+                  Description

 

 

 

 

 
-

-Preferences
-

-
Preferences — Functions to manage preferences

+
Preferences

+
Preferences — Functions to manage preferences

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 #include <ogmrip-preferences.h>
 
-
 GConfValue*         (*OGMRipPrefGetFunc)                (GConfValue*         (*OGMRipPrefGetFunc)                (GtkWidget *widget);
 gboolean            (*OGMRipPrefSetFunc)                (gboolean            (*OGMRipPrefSetFunc)                (GtkWidget *widget,
                                                          GConfValue *value);
-void                ogmrip_preferences_init             (const ogmrip_preferences_init             (const gchar *dir);
-void                ogmrip_preferences_uninit           (void);
+void                ogmrip_preferences_uninit           (void);
 GConfValue*         ogmrip_preferences_get              (const GConfValue*         ogmrip_preferences_get              (const gchar *key);
+void                ogmrip_preferences_set              (const gchar *key,
+                                                         GConfValue *value);
 gboolean            ogmrip_preferences_get_bool         (const gboolean            ogmrip_preferences_get_bool         (const gchar *key,
                                                          gboolean def);
-void                ogmrip_preferences_set_bool         (const ogmrip_preferences_set_bool         (const gchar *key,
                                                          gboolean value);
 gdouble             ogmrip_preferences_get_double       (const gchar *key,
+                                                         gdouble def);
+void                ogmrip_preferences_set_double       (const gchar *key,
+                                                         gdouble value);
+gint                ogmrip_preferences_get_int          (const gint                ogmrip_preferences_get_int          (const gchar *key,
                                                          gint def);
-void                ogmrip_preferences_set_int          (const ogmrip_preferences_set_int          (const gchar *key,
                                                          gint value);
 gchar*              ogmrip_preferences_get_string       (const gchar*              ogmrip_preferences_get_string       (const gchar *key,
                                                          const gchar *def);
-void                ogmrip_preferences_set_string       (const ogmrip_preferences_set_string       (const gchar *key,
                                                          const gchar *value);
 gchar*              ogmrip_preferences_get_filename     (const gchar*              ogmrip_preferences_get_filename     (const gchar *key,
                                                          const gchar *def);
-void                ogmrip_preferences_set_filename     (const ogmrip_preferences_set_filename     (const gchar *key,
                                                          const gchar *value);
 guint               ogmrip_preferences_add_notify       (const guint               ogmrip_preferences_add_notify       (const gchar *key,
                                                          gpointer data);
 guint               ogmrip_preferences_add_notify_while_alive
+>guint               ogmrip_preferences_add_notify_while_alive
                                                         (const gchar *key,
@@ -150,85 +167,109 @@
                                                          gpointer widget);
-void                ogmrip_preferences_connect_toggle   (ogmrip_preferences_connect_toggle   (GtkWidget *toggle,
                                                          const gchar *key);
-void                ogmrip_preferences_connect_toggle_custom
+void                ogmrip_preferences_connect_toggle_custom
                                                         (GtkWidget *toggle,
                                                          const gchar *key,
-                                                         OGMRipPrefGetFunc get_func,
-                                                         OGMRipPrefSetFunc set_func);
-void                ogmrip_preferences_connect_combo    (OGMRipPrefGetFunc get_func,
+                                                         OGMRipPrefSetFunc set_func);
+void                ogmrip_preferences_connect_combo    (GtkWidget *combo,
                                                          const gchar *key);
-void                ogmrip_preferences_connect_combo_custom
+void                ogmrip_preferences_connect_combo_custom
                                                         (GtkWidget *combo,
                                                          const gchar *key,
-                                                         OGMRipPrefGetFunc get_func,
-                                                         OGMRipPrefSetFunc set_func);
-void                ogmrip_preferences_connect_chooser  (OGMRipPrefGetFunc get_func,
+                                                         OGMRipPrefSetFunc set_func);
+void                ogmrip_preferences_connect_chooser  (GtkWidget *chooser,
                                                          const gchar *key);
-void                ogmrip_preferences_connect_chooser_custom
+void                ogmrip_preferences_connect_chooser_custom
                                                         (GtkWidget *chooser,
                                                          const gchar *key,
-                                                         OGMRipPrefGetFunc get_func,
-                                                         OGMRipPrefSetFunc set_func);
-void                ogmrip_preferences_connect_spin     (OGMRipPrefGetFunc get_func,
+                                                         OGMRipPrefSetFunc set_func);
+void                ogmrip_preferences_connect_spin     (GtkWidget *spin,
                                                          const gchar *key);
-void                ogmrip_preferences_connect_spin_custom
+void                ogmrip_preferences_connect_spin_custom
                                                         (GtkWidget *spin,
                                                          const gchar *key,
-                                                         OGMRipPrefGetFunc get_func,
-                                                         OGMRipPrefSetFunc set_func);
-void                ogmrip_preferences_connect_radio    (OGMRipPrefGetFunc get_func,
+                                                         OGMRipPrefSetFunc set_func);
+void                ogmrip_preferences_connect_radio    (GtkWidget *radio,
                                                          const gchar *key);
-void                ogmrip_preferences_connect_radio_custom
+void                ogmrip_preferences_connect_radio_custom
                                                         (GtkWidget *radio,
                                                          const gchar *key,
-                                                         OGMRipPrefGetFunc get_func,
-                                                         OGMRipPrefSetFunc set_func);
+                                                         OGMRipPrefGetFunc get_func,
+                                                         OGMRipPrefSetFunc set_func);
+GSList*             ogmrip_preferences_all_dirs         (const gchar *dir);
+GSList*             ogmrip_preferences_all_entries      (const gchar *dir);
+gboolean            ogmrip_preferences_dir_exists       (const gchar *dir);
+void                ogmrip_preferences_recursive_unset  (const gchar *key);
+void                ogmrip_preferences_set_default_dir  (const gchar *dir);
+void                ogmrip_preferences_unset            (const gchar *key);
 

 

 

-
Description

+
Description

 

 

 

@@ -236,11 +277,10 @@
 

 

 

-
Details

+
Details

 

-

-OGMRipPrefGetFunc ()

-
OGMRipPrefGetFunc ()

+
GConfValue*         (*OGMRipPrefGetFunc)                (
 
 
-widget :
+
widget :

 
 
 
 
-Returns :
+
Returns :

 
 
 
@@ -268,9 +308,8 @@
 

 

 

-

-OGMRipPrefSetFunc ()

-
OGMRipPrefSetFunc ()

+
gboolean            (*OGMRipPrefSetFunc)                (
 
 
-widget :
+
widget :

 
 
 
 
-value :
+
value :

 
 
 
 
-Returns :
+
Returns :

 
 
 
@@ -306,9 +345,8 @@
 

 

 

-

-ogmrip_preferences_init ()

-
void                ogmrip_preferences_init             (const 
ogmrip_preferences_init ()

+
void                ogmrip_preferences_init             (const gchar *dir);

 

@@ -320,7 +358,7 @@
 

-
+
@@ -328,9 +366,8 @@
 

-

-ogmrip_preferences_uninit ()

-
void                ogmrip_preferences_uninit           (void);

+
ogmrip_preferences_uninit ()

+
void                ogmrip_preferences_uninit           (void);

 

 Uninitialize the preferences system.

 

@@ -339,9 +376,8 @@
 

-

-ogmrip_preferences_get ()

-
ogmrip_preferences_get ()

+
GConfValue*         ogmrip_preferences_get              (const 
 

-
+
-
+
-
+
-
+
-
+
@@ -409,9 +474,8 @@
 
 

 

-

-ogmrip_preferences_set_bool ()

-
void                ogmrip_preferences_set_bool         (const 
ogmrip_preferences_set_bool ()

+
void                ogmrip_preferences_set_bool         (const gchar *key,
                                                          
 

-
+
-
+
@@ -441,9 +505,76 @@
 
 

 

-

-ogmrip_preferences_get_int ()

-
ogmrip_preferences_get_double ()

+
gdouble             ogmrip_preferences_get_double       (const gchar *key,
+                                                         gdouble def);

+

+Requests the double value stored at key.

+

+
+

+

 
 
dir :
dir :

  directory to add to the list
 
 

 
 
 
 
 
key :
key :

  key to get
 
 

 
Returns :
Returns :

  newly-allocated GConfValue, or NULL if unset and no default exists
@@ -371,9 +407,38 @@
 
 

 

-

-ogmrip_preferences_get_bool ()

-
ogmrip_preferences_set ()

+
void                ogmrip_preferences_set              (const gchar *key,
+                                                         GConfValue *value);

+

+Sets the value of a configuration key.

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+


key :
 key to set
+
value :
 new value
+

+

+

+

+
ogmrip_preferences_get_bool ()

+
gboolean            ogmrip_preferences_get_bool         (const 
 

 
key :
key :

  key to get
 
 

 
def :
def :

  default value
 
 

 
Returns :
Returns :

  the value of key, or def if no value was stored
 
 

 
key :
key :

  key you want to set the value of
 
 

 
value :
value :

  new value of key
 
 

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


key :
 key to get
+
def :
 default value
+
Returns :
 the value of key, or def if no value was stored
+

+

+

+

+
ogmrip_preferences_set_double ()

+
void                ogmrip_preferences_set_double       (const gchar *key,
+                                                         gdouble value);

+

+Change the value of key to val. Automatically creates the key if it didn't
+exist before.

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+


key :
 key you want to set the value of
+
value :
 new value of key
+

+

+

+

+
ogmrip_preferences_get_int ()

+
gint                ogmrip_preferences_get_int          (const 
 
 
-key :
+
key :

  key to get
 
 
 
-def :
+
def :

  default value
 
 
 
-Returns :
+
Returns :

  the value of key, or def if no value was stored
 
 
@@ -479,9 +610,8 @@
 

 

 

-

-ogmrip_preferences_set_int ()

-
void                ogmrip_preferences_set_int          (const 
ogmrip_preferences_set_int ()

+
void                ogmrip_preferences_set_int          (const gchar *key,
                                                          
 
 
-key :
+
key :

  key you want to set the value of
 
 
 
-value :
+
value :

  new value of key
 
 
@@ -511,9 +641,8 @@
 

 

 

-

-ogmrip_preferences_get_string ()

-
ogmrip_preferences_get_string ()

+
gchar*              ogmrip_preferences_get_string       (const 
 
 
-key :
+
key :

  key to get
 
 
 
-def :
+
def :

  default value
 
 
 
-Returns :
+
Returns :

  the value of key, or def if no value was stored
 
 
@@ -549,9 +678,8 @@
 

 

 

-

-ogmrip_preferences_set_string ()

-
void                ogmrip_preferences_set_string       (const 
ogmrip_preferences_set_string ()

+
void                ogmrip_preferences_set_string       (const gchar *key,
                                                          const 
 
 
-key :
+
key :

  key you want to set the value of
 
 
 
-value :
+
value :

  new value of key
 
 
@@ -581,9 +709,8 @@
 

 

 

-

-ogmrip_preferences_get_filename ()

-
ogmrip_preferences_get_filename ()

+
gchar*              ogmrip_preferences_get_filename     (const 
 
 
-key :
+
key :

  key to get
 
 
 
-def :
+
def :

  default value
 
 
 
-Returns :
+
Returns :

  the value of key, or def if no value was stored
 
 
@@ -619,9 +746,8 @@
 

 

 

-

-ogmrip_preferences_set_filename ()

-
void                ogmrip_preferences_set_filename     (const 
ogmrip_preferences_set_filename ()

+
void                ogmrip_preferences_set_filename     (const gchar *key,
                                                          const 
 
 
-key :
+
key :

  key you want to set the value of
 
 
 
-value :
+
value :

  new value of key
 
 
@@ -651,9 +777,8 @@
 

 

 

-

-ogmrip_preferences_add_notify ()

-
ogmrip_preferences_add_notify ()

+
guint               ogmrip_preferences_add_notify       (const 
 
 
-key :
+
key :

  where to listen for changes
 
 
 
-func :
+
func :

  function to call when changes occur
 
 
 
-data :
+
data :

  user data to pass to func
 
 
 
-Returns :
+
Returns :

  a connection ID for removing the notification
 
 
@@ -698,9 +823,8 @@
 

 

 

-

-ogmrip_preferences_add_notify_while_alive ()

-
ogmrip_preferences_add_notify_while_alive ()

+
guint               ogmrip_preferences_add_notify_while_alive
                                                         (const 
 
 
-key :
+
key :

  where to listen for changes
 
 
 
-func :
+
func :

  function to call when changes occur
 
 
 
-data :
+
data :

  user data to pass to func
 
 
 
-widget :
+
widget :

  the widget whose destruction signals the removal of this notification
 
 
 
-Returns :
+
Returns :

  a connection ID for removing the notification
 
 
@@ -755,9 +879,8 @@
 

 

 

-

-ogmrip_preferences_connect_toggle ()

-
void                ogmrip_preferences_connect_toggle   (
ogmrip_preferences_connect_toggle ()

+
void                ogmrip_preferences_connect_toggle   (GtkWidget *toggle,
                                                          const gchar *key);

 

 Connects toggle to key. key must be associated to a boolean value.
-See ogmrip_preferences_connect_toggle_custom().

+See ogmrip_preferences_connect_toggle_custom().

 

 
 

@@ -773,14 +896,14 @@
 
 
 
-toggle :
+
toggle :

  A GtkToggleButton
 
 
 
-key :
+
key :

  The associated key
 
 
@@ -789,17 +912,16 @@
 

 

 

-

-ogmrip_preferences_connect_toggle_custom ()

-
void                ogmrip_preferences_connect_toggle_custom
+
ogmrip_preferences_connect_toggle_custom ()

+
void                ogmrip_preferences_connect_toggle_custom
                                                         (GtkWidget *toggle,
                                                          const gchar *key,
-                                                         OGMRipPrefGetFunc get_func,
-                                                         OGMRipPrefSetFunc set_func);

+                                                         OGMRipPrefGetFunc get_func,
+                                                         OGMRipPrefSetFunc set_func);

 

 Connects toggle to key. When the state of toggle changes, get_func is
 called and returns the new value for key. Accordingly, when key changes,
@@ -811,24 +933,24 @@
 
 
 
-toggle :
+
toggle :

  A GtkToggleButton
 
 
 
-key :
+
key :

  The associated key
 
 
 
-get_func :
+
get_func :

  The function to get the state of toggle
 
 
 
-set_func :
+
set_func :

  The function to set the state of toggle
 
 
@@ -837,9 +959,8 @@
 

 

 

-

-ogmrip_preferences_connect_combo ()

-
void                ogmrip_preferences_connect_combo    (
ogmrip_preferences_connect_combo ()

+
void                ogmrip_preferences_connect_combo    (GtkWidget *combo,
                                                          const gchar *key);

 

 Connects combo to key. key must be associated to an integer value.
-See ogmrip_preferences_connect_combo_custom().

+See ogmrip_preferences_connect_combo_custom().

 

 
 

@@ -855,14 +976,14 @@
 
 
 
-combo :
+
combo :

  A GtkComboBox
 
 
 
-key :
+
key :

  The associated key
 
 
@@ -871,17 +992,16 @@
 

 

 

-

-ogmrip_preferences_connect_combo_custom ()

-
void                ogmrip_preferences_connect_combo_custom
+
ogmrip_preferences_connect_combo_custom ()

+
void                ogmrip_preferences_connect_combo_custom
                                                         (GtkWidget *combo,
                                                          const gchar *key,
-                                                         OGMRipPrefGetFunc get_func,
-                                                         OGMRipPrefSetFunc set_func);

+                                                         OGMRipPrefGetFunc get_func,
+                                                         OGMRipPrefSetFunc set_func);

 

 Connects combo to key. When a new item in combo is selected, get_func is
 called and returns the new value for key. Accordingly, when key changes,
@@ -893,24 +1013,24 @@
 
 
 
-combo :
+
combo :

  A GtkComboBox
 
 
 
-key :
+
key :

  The associated key
 
 
 
-get_func :
+
get_func :

  The function to get the selected item of combo
 
 
 
-set_func :
+
set_func :

  The function to set the selected item of combo
 
 
@@ -919,9 +1039,8 @@
 

 

 

-

-ogmrip_preferences_connect_chooser ()

-
void                ogmrip_preferences_connect_chooser  (
ogmrip_preferences_connect_chooser ()

+
void                ogmrip_preferences_connect_chooser  (GtkWidget *chooser,
                                                          const gchar *key);

 

 Connects chooser to key. key must be associated to an integer value.
-See ogmrip_preferences_connect_chooser_custom().

+See ogmrip_preferences_connect_chooser_custom().

 

 
 

@@ -937,14 +1056,14 @@
 
 
 
-chooser :
+
chooser :

  A GtkFileChooser
 
 
 
-key :
+
key :

  The associated key
 
 
@@ -953,17 +1072,16 @@
 

 

 

-

-ogmrip_preferences_connect_chooser_custom ()

-
void                ogmrip_preferences_connect_chooser_custom
+
ogmrip_preferences_connect_chooser_custom ()

+
void                ogmrip_preferences_connect_chooser_custom
                                                         (GtkWidget *chooser,
                                                          const gchar *key,
-                                                         OGMRipPrefGetFunc get_func,
-                                                         OGMRipPrefSetFunc set_func);

+                                                         OGMRipPrefGetFunc get_func,
+                                                         OGMRipPrefSetFunc set_func);

 

 Connects chooser to key. When a new file is selected, get_func is
 called and returns the new value for key. Accordingly, when key changes,
@@ -975,22 +1093,22 @@
 
 
 
-chooser :
+
chooser :

  A GtkChooserFile
 
 
 
-key :
+
key :

  The associated key
 
 
 
-get_func :
+
get_func :

  The function to get the selected file of chooser
 
 
 
-set_func :
+
set_func :

  The function to set the selected file of chooser
 
 
@@ -999,9 +1117,8 @@
 

 

 

-

-ogmrip_preferences_connect_spin ()

-
void                ogmrip_preferences_connect_spin     (
ogmrip_preferences_connect_spin ()

+
void                ogmrip_preferences_connect_spin     (GtkWidget *spin,
                                                          const gchar *key);

 

 Connects spin to key. key must be associated to an integer value.
-See ogmrip_preferences_connect_spin_custom().

+See ogmrip_preferences_connect_spin_custom().

 

 
 

@@ -1017,14 +1134,14 @@
 
 
 
-spin :
+
spin :

  A GtkSpinButton
 
 
 
-key :
+
key :

  The associated key
 
 
@@ -1033,17 +1150,16 @@
 

 

 

-

-ogmrip_preferences_connect_spin_custom ()

-
void                ogmrip_preferences_connect_spin_custom
+
ogmrip_preferences_connect_spin_custom ()

+
void                ogmrip_preferences_connect_spin_custom
                                                         (GtkWidget *spin,
                                                          const gchar *key,
-                                                         OGMRipPrefGetFunc get_func,
-                                                         OGMRipPrefSetFunc set_func);

+                                                         OGMRipPrefGetFunc get_func,
+                                                         OGMRipPrefSetFunc set_func);

 

 Connects spin to key. When a new value in spin is selected, get_func is
 called and returns the new value for key. Accordingly, when key changes,
@@ -1055,24 +1171,24 @@
 
 
 
-spin :
+
spin :

  A GtkSpinButton
 
 
 
-key :
+
key :

  The associated key
 
 
 
-get_func :
+
get_func :

  The function to get the value of spin
 
 
 
-set_func :
+
set_func :

  The function to set the value of spin
 
 
@@ -1081,9 +1197,8 @@
 

 

 

-

-ogmrip_preferences_connect_radio ()

-
void                ogmrip_preferences_connect_radio    (
ogmrip_preferences_connect_radio ()

+
void                ogmrip_preferences_connect_radio    (GtkWidget *radio,
                                                          const gchar *key);

 

 Connects radio to key. key must be associated to an integer value.
-See ogmrip_preferences_connect_radio_custom().

+See ogmrip_preferences_connect_radio_custom().

 

 
 

@@ -1099,14 +1214,14 @@
 
 
 
-radio :
+
radio :

  A GtkRadioButton
 
 
 
-key :
+
key :

  The associated key
 
 
@@ -1115,17 +1230,16 @@
 

 

 

-

-ogmrip_preferences_connect_radio_custom ()

-
void                ogmrip_preferences_connect_radio_custom
+
ogmrip_preferences_connect_radio_custom ()

+
void                ogmrip_preferences_connect_radio_custom
                                                         (GtkWidget *radio,
                                                          const gchar *key,
-                                                         OGMRipPrefGetFunc get_func,
-                                                         OGMRipPrefSetFunc set_func);

+                                                         OGMRipPrefGetFunc get_func,
+                                                         OGMRipPrefSetFunc set_func);

 

 Connects radio to key. When radio is selected, get_func is
 called and returns the new value for key. Accordingly, when key changes,
@@ -1137,31 +1251,196 @@
 
 
 
-radio :
+
radio :

  A GtkRadioButton
 
 
 
-key :
+
key :

  The associated key
 
 
 
-get_func :
+
get_func :

  The function to get the selected radio
 
 
 
-set_func :
+
set_func :

  The function to set the selected radio
 
 
 
 

 

+

+

+
ogmrip_preferences_all_dirs ()

+
GSList*             ogmrip_preferences_all_dirs         (const gchar *dir);

+

+Lists the subdirectories in dir. The returned list contains allocated
+strings. Each string is the absolute path of a subdirectory. You should
+g_free() each string in the list, then g_slist_free() the list itself.

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+


dir :
 directory to get subdirectories from
+
Returns :
 List of allocated subdirectory names
+

+

+

+

+
ogmrip_preferences_all_entries ()

+
GSList*             ogmrip_preferences_all_entries      (const gchar *dir);

+

+Lists the key-value pairs in dir. Does not list subdirectories; for that use
+ogmrip_preferences_all_dirs(). The returned list contains GConfEntry objects.
+A GConfEntry contains an absolute key and a value. The list is not recursive,
+it contains only the immediate children of dir. To free the returned list,
+gconf_entry_free() each list element, then g_slist_free() the list itself.

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+


dir :
 directory to get entries from
+
Returns :
 List of GConfEntry
+

+

+

+

+
ogmrip_preferences_dir_exists ()

+
gboolean            ogmrip_preferences_dir_exists       (const gchar *dir);

+

+Queries whether the directory dir exists in the database.

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+


dir :
 directory to check for
+
Returns :
 TRUE or FALSE
+

 

+

+

+
ogmrip_preferences_recursive_unset ()

+
void                ogmrip_preferences_recursive_unset  (const gchar *key);

+

+Unsets all keys below key, including key itself. If any unset fails,
+continues on to unset as much as it can.

+

+
+

+

++
+
+
+
+


key :
 a key or directory name to be unset
+

 

+

+

+
ogmrip_preferences_set_default_dir ()

+
void                ogmrip_preferences_set_default_dir  (const gchar *dir);

+

+Sets the default preferences directory.

+

+
+

+

++
+
+
+
+


dir :
 A preferences directory
+

+

+

+

+
ogmrip_preferences_unset ()

+
void                ogmrip_preferences_unset            (const gchar *key);

+

+Unsets the value of key; if key is already unset, has no effect.

+

+
+

+

++
+
+
+
+


key :
 key to unset
+

+

+

+

+

+

+          Generated by GTK-Doc V1.10

 
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ogmrip-source-chooser.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ogmrip-source-chooser.html
--- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ogmrip-source-chooser.html	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ogmrip-source-chooser.html	2008-09-28 19:28:17.000000000 +0200
@@ -1,17 +1,17 @@
 
 
 
-
+
 OGMRipSourceChooser
-
+
 
 
 
 
-
+
 
-
-
+
+
 
 
 
@@ -24,64 +24,59 @@
 OGMRip Gtk+ Reference Manual
 Next
 
-Top
-                   | 
-                  Description
-                   | 
-                  Object Hierarchy
-                   | 
-                  Prerequisites
-                   | 
-                  Properties
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Prerequisites
+                   | 
+                  Properties
 
 

 

 

 
-

-OGMRipSourceChooser
-

-
OGMRipSourceChooser — Source chooser interface used by OGMRipSourceChooserWidget

+
OGMRipSourceChooser

+
OGMRipSourceChooser — Source chooser interface used by OGMRipSourceChooserWidget

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 #include <ogmrip-source-chooser.h>
 
-
-enum                OGMRipSourceType;
-                    OGMRipSourceChooser;
-                    OGMRipSourceChooserIface;
-void                ogmrip_source_chooser_set_title     (OGMRipSourceChooser *chooser,
+enum                OGMRipSourceType;
+                    OGMRipSourceChooser;
+                    OGMRipSourceChooserIface;
+void                ogmrip_source_chooser_set_title     (OGMRipSourceChooser *chooser,
                                                          OGMDvdTitle *title);
 OGMDvdTitle*        ogmrip_source_chooser_get_title     (OGMRipSourceChooser *chooser);
-OGMRipSource*       ogmrip_source_chooser_get_active    (OGMRipSourceChooser *chooser,
-                                                         OGMRipSourceType *type);
-void                ogmrip_source_chooser_select_language
-                                                        (OGMRipSourceChooser *chooser,
+href="/usr/share/gtk-doc/html/ogmdvd/ogmdvd-ogmdvd-types.html#OGMDvdTitle"
+>OGMDvdTitle*        ogmrip_source_chooser_get_title     (OGMRipSourceChooser *chooser);
+OGMRipSource*       ogmrip_source_chooser_get_active    (OGMRipSourceChooser *chooser,
+                                                         OGMRipSourceType *type);
+void                ogmrip_source_chooser_select_language
+                                                        (OGMRipSourceChooser *chooser,
                                                          gint language);
-
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
-
   GInterface
    +----OGMRipSourceChooser
 

 

 

-
Prerequisites

+
Prerequisites

 

 OGMRipSourceChooser requires
  GtkWidget.

 

 

-
Properties

+
Properties

 
-
-  "source"                   source"                   gpointer              : Read / Write
-  "title"                    title"                    gpointer              : Read / Write
 

 

 

-
Description

+
Description

 

 

 

@@ -109,11 +103,10 @@
 

 

 

-
Details

+
Details

 

-

-enum OGMRipSourceType

-
typedef enum
+
enum OGMRipSourceType

+
typedef enum
 {
   OGMRIP_SOURCE_INVALID = -1,
   OGMRIP_SOURCE_NONE,
@@ -130,22 +123,22 @@
 
 
 
-OGMRIP_SOURCE_INVALID
+
OGMRIP_SOURCE_INVALID

  This is not a valid source
 
 
 
-OGMRIP_SOURCE_NONE
+
OGMRIP_SOURCE_NONE

  No source is selected
 
 
 
-OGMRIP_SOURCE_STREAM
+
OGMRIP_SOURCE_STREAM

  The source is a DVD stream
 
 
 
-OGMRIP_SOURCE_FILE
+
OGMRIP_SOURCE_FILE

  The source is a file
 
 
@@ -154,18 +147,16 @@
 

 

 

-

-OGMRipSourceChooser

-
typedef struct _OGMRipSourceChooser OGMRipSourceChooser;

+
OGMRipSourceChooser

+
typedef struct _OGMRipSourceChooser OGMRipSourceChooser;

 

 
 

 

 

 

-

-OGMRipSourceChooserIface

-
typedef struct {
+
OGMRipSourceChooserIface

+
typedef struct {
   GTypeInterface base_iface;
 
   void           (* set_title)       (OGMRipSourceChooser *chooser,
@@ -184,15 +175,14 @@
 

 

 

-

-ogmrip_source_chooser_set_title ()

-
void                ogmrip_source_chooser_set_title     (OGMRipSourceChooser *chooser,
+
ogmrip_source_chooser_set_title ()

+
void                ogmrip_source_chooser_set_title     (OGMRipSourceChooser *chooser,
                                                          OGMDvdTitle *title);

 

 Sets the OGMDvdTitle from which to select the source.

 

 
@@ -201,14 +191,14 @@
 
 
 
-chooser :
- An OGMRipSourceChooser
+
chooser :

+ An OGMRipSourceChooser
 
 
 
-title :
+
title :

  An OGMDvdTitle
 
 
@@ -217,13 +207,12 @@
 

 

 

-

-ogmrip_source_chooser_get_title ()

-
OGMDvdTitle*        ogmrip_source_chooser_get_title     (OGMRipSourceChooser *chooser);

+
ogmrip_source_chooser_get_title ()

+
OGMDvdTitle*        ogmrip_source_chooser_get_title     (OGMRipSourceChooser *chooser);

 

-Returns the OGMDvdTitle which was passed to ogmrip_source_chooser_set_title().

+Returns the OGMDvdTitle which was passed to ogmrip_source_chooser_set_title().

 

 
 

@@ -231,14 +220,14 @@
 
 
 
-chooser :
- An OGMRipSourceChooser
+
chooser :

+ An OGMRipSourceChooser
 
 
 
-Returns :
+
Returns :

  The current OGMDvdTitle
 
 
@@ -247,10 +236,9 @@
 

 

 

-

-ogmrip_source_chooser_get_active ()

-
OGMRipSource*       ogmrip_source_chooser_get_active    (OGMRipSourceChooser *chooser,
-                                                         OGMRipSourceType *type);

+
ogmrip_source_chooser_get_active ()

+
OGMRipSource*       ogmrip_source_chooser_get_active    (OGMRipSourceChooser *chooser,
+                                                         OGMRipSourceType *type);

 

 Returns the active source and its type.

 

@@ -260,17 +248,17 @@
 
 
 
-chooser :
- An OGMRipSourceChooser
+
chooser :

+ An OGMRipSourceChooser
 
 
 
-type :
+
type :

  A pointer to store the type of the chooser
 
 
 
-Returns :
+
Returns :

  The active OGMRipSource
 
 
@@ -279,10 +267,9 @@
 

 

 

-

-ogmrip_source_chooser_select_language ()

-
void                ogmrip_source_chooser_select_language
-                                                        (OGMRipSourceChooser *chooser,
+
ogmrip_source_chooser_select_language ()

+
void                ogmrip_source_chooser_select_language
+                                                        (OGMRipSourceChooser *chooser,
                                                          gint language);

@@ -295,12 +282,12 @@
 
 
 
-chooser :
- An OGMRipSourceChooser
+
chooser :

+ An OGMRipSourceChooser
 
 
 
-language :
+
language :

  The language to select
 
 
@@ -309,25 +296,26 @@
 

 

 

-
Property Details

+
Property Details

 

-

-The "source" property

-
  "source"                   
The "source" property

+
  "source"                   gpointer              : Read / Write

 
The active source.

 

 

 

-

-The "title" property

-
  "title"                    
The "title" property

+
  "title"                    gpointer              : Read / Write

 
The DVD title.

 

 

 

+

+

+          Generated by GTK-Doc V1.10

 
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk-OGMRipSourceChooserWidget.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk-OGMRipSourceChooserWidget.html
--- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk-OGMRipSourceChooserWidget.html	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk-OGMRipSourceChooserWidget.html	2008-09-28 19:28:17.000000000 +0200
@@ -1,17 +1,17 @@
 
 
 
-
+
 OGMRipSourceChooserWidget
-
+
 
 
 
 
-
+
 
-
-
+
+
 
 
 
@@ -24,41 +24,37 @@
 OGMRip Gtk+ Reference Manual
 Next
 
-Top
-                   | 
-                  Description
+Top
+                   | 
+                  Description
 
 

 

 

 
-

-OGMRipSourceChooserWidget
-

-
OGMRipSourceChooserWidget — Source chooser widget that can be embedded in other widgets

+
OGMRipSourceChooserWidget

+
OGMRipSourceChooserWidget — Source chooser widget that can be embedded in other widgets

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 #include <ogmrip-source-chooser-widget.h>
 
-
-                    OGMRipSourceChooserWidgetPriv;
-                    OGMRipSourceChooserWidget;
+                    OGMRipSourceChooserWidgetPriv;
+                    OGMRipSourceChooserWidget;
 GtkWidget*          ogmrip_audio_chooser_widget_new     (void);
+>GtkWidget*          ogmrip_audio_chooser_widget_new     (void);
 GtkWidget*          ogmrip_subtitle_chooser_widget_new  (void);
-
+>GtkWidget*          ogmrip_subtitle_chooser_widget_new  (void);
 

 

 

-
Description

+
Description

 

 

 

@@ -66,20 +62,18 @@
 

 

 

-
Details

+
Details

 

-

-OGMRipSourceChooserWidgetPriv

-
typedef struct _OGMRipSourceChooserWidgetPriv OGMRipSourceChooserWidgetPriv;

+
OGMRipSourceChooserWidgetPriv

+
typedef struct _OGMRipSourceChooserWidgetPriv OGMRipSourceChooserWidgetPriv;

 

 
 

 

 

 

-

-OGMRipSourceChooserWidget

-
typedef struct {
+
OGMRipSourceChooserWidget

+
typedef struct {
   GtkComboBox parent_instance;
   OGMRipSourceChooserWidgetPriv *priv;
 } OGMRipSourceChooserWidget;
@@ -90,47 +84,48 @@
 

 

 

-

-ogmrip_audio_chooser_widget_new ()

-
ogmrip_audio_chooser_widget_new ()

+
GtkWidget*          ogmrip_audio_chooser_widget_new     (void);

 

-Creates a new OGMRipSourceChooserWidget for audio streams.

+Creates a new OGMRipSourceChooserWidget for audio streams.

 

 
 

 

-
-
+

 
 
Returns : The new OGMRipSourceChooserWidget
+
Returns :
 The new OGMRipSourceChooserWidget
 
 

 

 

 

 

-

-ogmrip_subtitle_chooser_widget_new ()

-
ogmrip_subtitle_chooser_widget_new ()

+
GtkWidget*          ogmrip_subtitle_chooser_widget_new  (void);

 

-Creates a new OGMRipSourceChooserWidget for subtitles streams.

+Creates a new OGMRipSourceChooserWidget for subtitles streams.

 

 
 

 

-
-
+

 
 
Returns : The new OGMRipSourceChooserWidget
+
Returns :
 The new OGMRipSourceChooserWidget
 
 

 

 

 

 

+

+

+          Generated by GTK-Doc V1.10

 
 
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ref.html /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ref.html
--- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ref.html	2007-10-21 21:13:51.000000000 +0200
+++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/ogmrip-gtk-ref.html	2008-09-28 19:28:17.000000000 +0200
@@ -1,35 +1,49 @@
 
 
 
-
-Part I. OGMRip Gtk+ Core Reference
-
+
+Part I. OGMRip Gtk+ Core Reference
+
 
 
 
 
-
+
 
-
-
+
+
 
 
 
 
 
-
+
 

 

-Part I. OGMRip Gtk+ Core Reference

+Part I. OGMRip Gtk+ Core Reference

This section describes the public functions and types.

+
+

Table of Contents

+
+
+Helper — A list of helper functions +
+
+Preferences — Functions to manage preferences +
+
+
+
+
+ Generated by GTK-Doc V1.10
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/style.css /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/style.css --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/html/style.css 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/html/style.css 2008-09-28 19:28:17.000000000 +0200 @@ -1,16 +1,16 @@ -.synopsis, .classsynopsis +.synopsis, .classsynopsis { background: #eeeeee; border: solid 1px #aaaaaa; padding: 0.5em; } -.programlisting +.programlisting { background: #eeeeff; border: solid 1px #aaaaff; padding: 0.5em; } -.variablelist +.variablelist { padding: 4px; margin-left: 3em; @@ -19,62 +19,93 @@ { vertical-align: top; } + /* this is needed so that the local anchors are displayed below the naviagtion */ -div.refnamediv a[name], div.refsect1 a[name] -{ - position: relative; - top: -4.5em; -} -table.navigation#top -{ - background: #ffeeee; - border: solid 1px #ffaaaa; - margin-top: 0; - margin-bottom: 0; - position: fixed; - top: 0; - left: 0; - height: 2em; - z-index: 1; +@media screen { + sup a.footnote + { + position: relative; + top: 0em ! important; + } + div.refnamediv a[name], div.refsect1 a[name] + { + position: relative; + top: -4.5em; + } + table.navigation#top + { + background: #ffeeee; + border: solid 1px #ffaaaa; + margin-top: 0; + margin-bottom: 0; + position: fixed; + top: 0; + left: 0; + height: 2em; + z-index: 1; + } + .navigation a + { + color: #770000; + } + .navigation a:visited + { + color: #550000; + } + td.shortcuts + { + color: #770000; + font-size: 80%; + } + div.refentry, div.chapter, div.reference, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface + { + position: relative; + top: 3em; + z-index: 0; + } + div.refnamediv + { + margin-top: 2em; + } + body + { + padding-bottom: 20em; + } +} +@media print { + table.navigation { + visibility: collapse; + display: none; + } + div.titlepage table.navigation { + visibility: visible; + display: table; + background: #ffeeee; + border: solid 1px #ffaaaa; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + height: 2em; + } } -.navigation a -{ - color: #770000; -} -.navigation a:visited -{ - color: #550000; -} -.navigation .title + +.navigation .title { font-size: 200%; } -td.shortcuts -{ - color: #770000; - font-size: 80%; -} -div.refentry, div.chapter, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface -{ - position: relative; - top: 3em; - z-index: 0; -} -div.refnamediv -{ - margin-top: 2em; -} -div.gallery-float + +div.gallery-float { float: left; padding: 10px; } -div.gallery-float img +div.gallery-float img { border-style: none; } -div.gallery-spacer +div.gallery-spacer { clear: both; } @@ -110,3 +141,20 @@ { background-color: #eeeeee; } + +hr +{ + color: #777777; + background: #777777; + border: 0; + height: 1px; + clear: both; +} + +.footer +{ + padding-top: 3.5em; + color: #777777; + text-align: center; + font-size: 80%; +} diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/Makefile.am /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/Makefile.am --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/Makefile.am 2007-10-07 21:03:53.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/Makefile.am 2008-07-15 23:46:29.000000000 +0200 @@ -14,18 +14,19 @@ include $(top_srcdir)/gtk-doc.make CFLAGS = \ - $(OGMRIP_CFLAGS) $(GUI_CFLAGS) \ + $(OGMRIP_CFLAGS) $(GUI_CFLAGS) \ -I$(top_srcdir)/libogmdvd \ -I$(top_srcdir)/libogmdvd-gtk \ + -I$(top_srcdir)/libogmjob \ -I$(top_srcdir)/libogmrip \ -I$(top_srcdir)/libogmrip-gtk \ -I$(top_srcdir)/libbacon LDFLAGS = -lstdc++ \ - $(OGMRIP_LIBS) $(HAL_LIBS) $(HAL5_LIBS) \ - $(top_builddir)/libogmdvd/libogmdvd.la \ - $(top_builddir)/libogmdvd-gtk/libogmdvd-gtk.la \ - $(top_builddir)/libbacon/libbacon.a \ - $(top_builddir)/libogmjob/libogmjob.la \ - $(top_builddir)/libogmrip/libogmrip.la \ - $(top_builddir)/libogmrip-gtk/libogmrip-gtk.la + $(top_builddir)/libogmdvd/libogmdvd.la \ + $(top_builddir)/libogmdvd-gtk/libogmdvd-gtk.la \ + $(top_builddir)/libogmjob/libogmjob.la \ + $(top_builddir)/libogmrip/libogmrip.la \ + $(top_builddir)/libogmrip-gtk/libogmrip-gtk.la \ + $(top_builddir)/libbacon/libbacon.a \ + $(OGMRIP_LIBS) $(HAL_LIBS) diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/Makefile.in /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/Makefile.in --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/Makefile.in 2007-10-21 21:05:55.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/Makefile.in 2008-09-21 14:16:35.000000000 +0200 @@ -45,8 +45,7 @@ $(top_srcdir)/gtk-doc.make subdir = docs/reference/ogmrip-gtk ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -70,9 +69,10 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = \ - $(OGMRIP_CFLAGS) $(GUI_CFLAGS) \ + $(OGMRIP_CFLAGS) $(GUI_CFLAGS) \ -I$(top_srcdir)/libogmdvd \ -I$(top_srcdir)/libogmdvd-gtk \ + -I$(top_srcdir)/libogmjob \ -I$(top_srcdir)/libogmrip \ -I$(top_srcdir)/libogmrip-gtk \ -I$(top_srcdir)/libbacon @@ -87,6 +87,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ DVDREAD_LIBS = @DVDREAD_LIBS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -100,7 +101,6 @@ ENCHANT_LIBS = @ENCHANT_LIBS@ EXEEXT = @EXEEXT@ F77 = @F77@ -FAAC_PROG = @FAAC_PROG@ FFLAGS = @FFLAGS@ GCONFTOOL = @GCONFTOOL@ GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ @@ -111,8 +111,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GOCR_PROG = @GOCR_PROG@ GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ GUI_CFLAGS = @GUI_CFLAGS@ @@ -121,24 +121,38 @@ HAL_LIBS = @HAL_LIBS@ HAVE_AAC_SUPPORT_FALSE = @HAVE_AAC_SUPPORT_FALSE@ HAVE_AAC_SUPPORT_TRUE = @HAVE_AAC_SUPPORT_TRUE@ -HAVE_DTS_SUPPORT_FALSE = @HAVE_DTS_SUPPORT_FALSE@ -HAVE_DTS_SUPPORT_TRUE = @HAVE_DTS_SUPPORT_TRUE@ HAVE_ENCHANT_SUPPORT_FALSE = @HAVE_ENCHANT_SUPPORT_FALSE@ HAVE_ENCHANT_SUPPORT_TRUE = @HAVE_ENCHANT_SUPPORT_TRUE@ HAVE_GTK_SUPPORT_FALSE = @HAVE_GTK_SUPPORT_FALSE@ HAVE_GTK_SUPPORT_TRUE = @HAVE_GTK_SUPPORT_TRUE@ +HAVE_LAVC_SUPPORT_FALSE = @HAVE_LAVC_SUPPORT_FALSE@ +HAVE_LAVC_SUPPORT_TRUE = @HAVE_LAVC_SUPPORT_TRUE@ HAVE_LAVF_SUPPORT_FALSE = @HAVE_LAVF_SUPPORT_FALSE@ HAVE_LAVF_SUPPORT_TRUE = @HAVE_LAVF_SUPPORT_TRUE@ HAVE_MKV_SUPPORT_FALSE = @HAVE_MKV_SUPPORT_FALSE@ HAVE_MKV_SUPPORT_TRUE = @HAVE_MKV_SUPPORT_TRUE@ +HAVE_MP3_SUPPORT_FALSE = @HAVE_MP3_SUPPORT_FALSE@ +HAVE_MP3_SUPPORT_TRUE = @HAVE_MP3_SUPPORT_TRUE@ +HAVE_MP4_SUPPORT_FALSE = @HAVE_MP4_SUPPORT_FALSE@ +HAVE_MP4_SUPPORT_TRUE = @HAVE_MP4_SUPPORT_TRUE@ +HAVE_OGM_SUPPORT_FALSE = @HAVE_OGM_SUPPORT_FALSE@ +HAVE_OGM_SUPPORT_TRUE = @HAVE_OGM_SUPPORT_TRUE@ +HAVE_PNG_SUPPORT_FALSE = @HAVE_PNG_SUPPORT_FALSE@ +HAVE_PNG_SUPPORT_TRUE = @HAVE_PNG_SUPPORT_TRUE@ HAVE_SRT_SUPPORT_FALSE = @HAVE_SRT_SUPPORT_FALSE@ HAVE_SRT_SUPPORT_TRUE = @HAVE_SRT_SUPPORT_TRUE@ HAVE_THEORA_SUPPORT_FALSE = @HAVE_THEORA_SUPPORT_FALSE@ HAVE_THEORA_SUPPORT_TRUE = @HAVE_THEORA_SUPPORT_TRUE@ +HAVE_TIFF_SUPPORT_FALSE = @HAVE_TIFF_SUPPORT_FALSE@ +HAVE_TIFF_SUPPORT_TRUE = @HAVE_TIFF_SUPPORT_TRUE@ +HAVE_VORBIS_SUPPORT_FALSE = @HAVE_VORBIS_SUPPORT_FALSE@ +HAVE_VORBIS_SUPPORT_TRUE = @HAVE_VORBIS_SUPPORT_TRUE@ HAVE_X264_SUPPORT_FALSE = @HAVE_X264_SUPPORT_FALSE@ HAVE_X264_SUPPORT_TRUE = @HAVE_X264_SUPPORT_TRUE@ HAVE_XSLTPROC_PROG_FALSE = @HAVE_XSLTPROC_PROG_FALSE@ HAVE_XSLTPROC_PROG_TRUE = @HAVE_XSLTPROC_PROG_TRUE@ +HAVE_XVID_SUPPORT_FALSE = @HAVE_XVID_SUPPORT_FALSE@ +HAVE_XVID_SUPPORT_TRUE = @HAVE_XVID_SUPPORT_TRUE@ HTML_DIR = @HTML_DIR@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -150,14 +164,12 @@ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_ICONV = @INTLTOOL_ICONV@ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -169,24 +181,27 @@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -LAME_PROG = @LAME_PROG@ LDFLAGS = -lstdc++ \ - $(OGMRIP_LIBS) $(HAL_LIBS) $(HAL5_LIBS) \ - $(top_builddir)/libogmdvd/libogmdvd.la \ - $(top_builddir)/libogmdvd-gtk/libogmdvd-gtk.la \ - $(top_builddir)/libbacon/libbacon.a \ - $(top_builddir)/libogmjob/libogmjob.la \ - $(top_builddir)/libogmrip/libogmrip.la \ - $(top_builddir)/libogmrip-gtk/libogmrip-gtk.la + $(top_builddir)/libogmdvd/libogmdvd.la \ + $(top_builddir)/libogmdvd-gtk/libogmdvd-gtk.la \ + $(top_builddir)/libogmjob/libogmjob.la \ + $(top_builddir)/libogmrip/libogmrip.la \ + $(top_builddir)/libogmrip-gtk/libogmrip-gtk.la \ + $(top_builddir)/libbacon/libbacon.a \ + $(OGMRIP_LIBS) $(HAL_LIBS) LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ +LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBTIFF_LIBS = @LIBTIFF_LIBS@ LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -195,21 +210,15 @@ MAKEINFO = @MAKEINFO@ MENCODER_PROG = @MENCODER_PROG@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MKVMERGE_PROG = @MKVMERGE_PROG@ -MPLAYER_MAJOR_VERSION = @MPLAYER_MAJOR_VERSION@ -MPLAYER_MINOR_VERSION = @MPLAYER_MINOR_VERSION@ -MPLAYER_PRE_VERSION = @MPLAYER_PRE_VERSION@ MPLAYER_PROG = @MPLAYER_PROG@ -MPLAYER_RC_VERSION = @MPLAYER_RC_VERSION@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ -OCRAD_PROG = @OCRAD_PROG@ -OGGENC_PROG = @OGGENC_PROG@ OGMDVD_GTK_LT_VERSION = @OGMDVD_GTK_LT_VERSION@ OGMDVD_LT_VERSION = @OGMDVD_LT_VERSION@ OGMJOB_LT_VERSION = @OGMJOB_LT_VERSION@ -OGMMERGE_PROG = @OGMMERGE_PROG@ OGMRIP_CFLAGS = @OGMRIP_CFLAGS@ OGMRIP_GTK_LT_VERSION = @OGMRIP_GTK_LT_VERSION@ OGMRIP_LIBS = @OGMRIP_LIBS@ @@ -218,7 +227,6 @@ OGMRIP_MICRO_VERSION = @OGMRIP_MICRO_VERSION@ OGMRIP_MINOR_VERSION = @OGMRIP_MINOR_VERSION@ OGMRIP_VERSION = @OGMRIP_VERSION@ -OGMSPLIT_PROG = @OGMSPLIT_PROG@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -297,10 +305,10 @@ HFILE_GLOB = $(top_srcdir)/libogmrip-gtk/*.h CFILE_GLOB = $(top_srcdir)/libogmrip-gtk/*.c IGNORE_HFILES = ogmrip-gtk.h ogmrip-marshal.h -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) # We set GPATH here; this gives us semantics for GNU make # which are more like other make's VPATH, when it comes to @@ -326,7 +334,12 @@ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals -CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS) +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) all: all-am .SUFFIXES: @@ -442,7 +455,8 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic distclean-libtool \ + distclean-local dvi: dvi-am @@ -485,9 +499,9 @@ .PHONY: all all-am all-local check check-am clean clean-generic \ clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-local install-exec \ + distclean-generic distclean-libtool distclean-local distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic \ @@ -532,6 +546,9 @@ tmpl.stamp: tmpl-build.stamp @true +tmpl/*.sgml: + @true + #### xml #### sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) @@ -549,11 +566,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Building HTML' @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html + rm -rf $(srcdir)/html mkdir $(srcdir)/html cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' + @echo 'gtk-doc: Fixing cross-references' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp @@ -563,11 +580,16 @@ rm -f *~ *.bak rm -rf .libs +distclean-local: + cd $(srcdir) && \ + rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + cd $(srcdir) && rm -rf xml html install-data-local: - installfiles=`echo $(srcdir)/html/*`; \ + -installfiles=`echo $(srcdir)/html/*`; \ if test "$$installfiles" = '$(srcdir)/html/*'; \ then echo '-- Nothing to install' ; \ else \ @@ -578,6 +600,8 @@ done; \ echo '-- Installing $(srcdir)/html/index.sgml' ; \ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + which gtkdoc-rebase >/dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ fi uninstall-local: @@ -598,9 +622,10 @@ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/xml/*.xml $(distdir)/xml cp $(srcdir)/html/* $(distdir)/html - if test -f $(srcdir)/$(DOC_MODULE).types; then \ - cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \ - fi + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/ogmrip-gtk-sections.txt /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/ogmrip-gtk-sections.txt --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/ogmrip-gtk-sections.txt 2007-10-07 21:03:53.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/ogmrip-gtk-sections.txt 2008-09-28 19:28:17.000000000 +0200 @@ -27,6 +27,7 @@ ogmrip_chooser_list_add ogmrip_chooser_list_remove ogmrip_chooser_list_foreach +ogmrip_chooser_list_get_n_children OGMRIP_CHOOSER_LIST OGMRIP_IS_CHOOSER_LIST @@ -82,8 +83,11 @@ ogmrip_preferences_init ogmrip_preferences_uninit ogmrip_preferences_get +ogmrip_preferences_set ogmrip_preferences_get_bool ogmrip_preferences_set_bool +ogmrip_preferences_get_double +ogmrip_preferences_set_double ogmrip_preferences_get_int ogmrip_preferences_set_int ogmrip_preferences_get_string @@ -102,6 +106,12 @@ ogmrip_preferences_connect_spin_custom ogmrip_preferences_connect_radio ogmrip_preferences_connect_radio_custom +ogmrip_preferences_all_dirs +ogmrip_preferences_all_entries +ogmrip_preferences_dir_exists +ogmrip_preferences_recursive_unset +ogmrip_preferences_set_default_dir +ogmrip_preferences_unset
@@ -122,3 +132,22 @@ ogmrip_message_dialog
+
+ogmrip-options-plugins +OGMRipContainerOptionsPlugin +OGMRipVideoOptionsPlugin +OGMRipAudioOptionsPlugin +OGMRipSubpOptionsPlugin +OGMRipVideoPreset +ogmrip_options_plugin_init +ogmrip_options_plugin_uninit +ogmrip_options_plugin_exists +ogmrip_container_options_plugin_dialog_new +ogmrip_container_options_plugin_set_options +ogmrip_video_options_plugin_dialog_new +ogmrip_video_options_plugin_set_options +ogmrip_audio_options_plugin_dialog_new +ogmrip_audio_options_plugin_set_options +ogmrip_subp_options_plugin_dialog_new +ogmrip_subp_options_plugin_set_options +
diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/tmpl/ogmrip-chooser-list.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/tmpl/ogmrip-chooser-list.sgml --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/tmpl/ogmrip-chooser-list.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/tmpl/ogmrip-chooser-list.sgml 2008-09-28 19:28:16.000000000 +0200 @@ -101,3 +101,12 @@ @data: + + + + + +@list: +@Returns: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/tmpl/ogmrip-gtk-unused.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/tmpl/ogmrip-gtk-unused.sgml --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/tmpl/ogmrip-gtk-unused.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/tmpl/ogmrip-gtk-unused.sgml 2008-09-28 19:28:16.000000000 +0200 @@ -1,3 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + +ogmrip-options-plugin + + @@ -99,6 +123,34 @@ @Returns: + + + + + +@type: +@Returns: + + + + + + +@type: +@Returns: + + + + + + + + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/tmpl/ogmrip-options-plugins.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/tmpl/ogmrip-options-plugins.sgml --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/tmpl/ogmrip-options-plugins.sgml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/tmpl/ogmrip-options-plugins.sgml 2008-09-28 19:28:16.000000000 +0200 @@ -0,0 +1,164 @@ + +ogmrip-options-plugins + + + + + + + + + + + + + + + + + + + + + + +@module: +@dialog: +@type: +@set_options: + + + + + + +@module: +@dialog: +@type: +@set_options: + + + + + + +@module: +@dialog: +@type: +@set_options: + + + + + + +@module: +@dialog: +@type: +@set_options: + + + + + + +@OGMRIP_VIDEO_PRESET_EXTREME: +@OGMRIP_VIDEO_PRESET_HIGH: +@OGMRIP_VIDEO_PRESET_NORMAL: +@OGMRIP_VIDEO_PRESET_USER: + + + + + + + + + + + + + + + + + + + + +@type: +@Returns: + + + + + + + +@type: +@profile: +@Returns: + + + + + + + +@container: + + + + + + + +@type: +@profile: +@Returns: + + + + + + + +@codec: + + + + + + + +@type: +@profile: +@Returns: + + + + + + + +@codec: + + + + + + + +@type: +@profile: +@Returns: + + + + + + + +@codec: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/tmpl/ogmrip-preferences.sgml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/tmpl/ogmrip-preferences.sgml --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/tmpl/ogmrip-preferences.sgml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/tmpl/ogmrip-preferences.sgml 2008-09-28 19:28:16.000000000 +0200 @@ -60,6 +60,15 @@ @Returns: + + + + + +@key: +@value: + + @@ -79,6 +88,25 @@ @value: + + + + + +@key: +@def: +@Returns: + + + + + + + +@key: +@value: + + @@ -259,3 +287,54 @@ @set_func: + + + + + +@dir: +@Returns: + + + + + + + +@dir: +@Returns: + + + + + + + +@dir: +@Returns: + + + + + + + +@key: + + + + + + + +@dir: + + + + + + + +@key: + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/xml/ogmrip-chapter-list.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/xml/ogmrip-chapter-list.xml --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/xml/ogmrip-chapter-list.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/xml/ogmrip-chapter-list.xml 2008-09-28 19:28:16.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipChapterList +OGMRipChapterList 3 OGMRIP-GTK Library @@ -15,14 +15,13 @@ - + Synopsis #include <ogmrip-chapter-list.h> - OGMRipChapterList; GtkWidget* ogmrip_chapter_list_new (void); void ogmrip_chapter_list_select_all (OGMRipChapterList *list); @@ -30,14 +29,12 @@ gboolean ogmrip_chapter_list_get_selected (OGMRipChapterList *list, guint *start_chapter, gint *end_chapter); - - + Object Hierarchy - GObject +----GInitiallyUnowned +----GtkObject @@ -52,7 +49,7 @@ - + Implemented Interfaces OGMRipChapterList implements @@ -62,16 +59,15 @@ - + Signals - "selection-changed" : Run Last / No Recursion / No Hooks - + Description @@ -80,17 +76,17 @@ - + Details - -<anchor id="OGMRipChapterList-struct" role="struct"/>OGMRipChapterList -OGMRipChapterListtypedef struct _OGMRipChapterList OGMRipChapterList; + +OGMRipChapterList +OGMRipChapterListtypedef struct _OGMRipChapterList OGMRipChapterList; - -<anchor id="ogmrip-chapter-list-new" role="function"/>ogmrip_chapter_list_new () -ogmrip_chapter_list_newGtkWidget* ogmrip_chapter_list_new (void); + +ogmrip_chapter_list_new () +ogmrip_chapter_list_newGtkWidget* ogmrip_chapter_list_new (void); Creates a new OGMRipChapterList. @@ -99,9 +95,9 @@ Returns : The new OGMRipChapterList - -<anchor id="ogmrip-chapter-list-select-all" role="function"/>ogmrip_chapter_list_select_all () -ogmrip_chapter_list_select_allvoid ogmrip_chapter_list_select_all (OGMRipChapterList *list); + +ogmrip_chapter_list_select_all () +ogmrip_chapter_list_select_allvoid ogmrip_chapter_list_select_all (OGMRipChapterList *list); Select all the chapters of the list. @@ -111,9 +107,9 @@ An OGMRipChapterList - -<anchor id="ogmrip-chapter-list-deselect-all" role="function"/>ogmrip_chapter_list_deselect_all () -ogmrip_chapter_list_deselect_allvoid ogmrip_chapter_list_deselect_all (OGMRipChapterList *list); + +ogmrip_chapter_list_deselect_all () +ogmrip_chapter_list_deselect_allvoid ogmrip_chapter_list_deselect_all (OGMRipChapterList *list); Deselects all the chapters of the list. @@ -123,9 +119,9 @@ An OGMRipChapterList - -<anchor id="ogmrip-chapter-list-get-selected" role="function"/>ogmrip_chapter_list_get_selected () -ogmrip_chapter_list_get_selectedgboolean ogmrip_chapter_list_get_selected (OGMRipChapterList *list, + +ogmrip_chapter_list_get_selected () +ogmrip_chapter_list_get_selectedgboolean ogmrip_chapter_list_get_selected (OGMRipChapterList *list, guint *start_chapter, gint *end_chapter); @@ -148,10 +144,10 @@ - + Signal Details -<anchor id="OGMRipChapterList-selection-changed"/>The "selection-changed" signal -OGMRipChapterList::selection-changedvoid user_function (OGMRipChapterList *list, +The <literal>"selection-changed"</literal> signal +OGMRipChapterList::selection-changedvoid user_function (OGMRipChapterList *list, gpointer user_data) : Run Last / No Recursion / No Hooks Emitted each time the selection of chapters changes diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/xml/ogmrip-chooser-list.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/xml/ogmrip-chooser-list.xml --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/xml/ogmrip-chooser-list.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/xml/ogmrip-chooser-list.xml 2008-09-28 19:28:16.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipChooserList +OGMRipChooserList 3 OGMRIP-GTK Library @@ -15,14 +15,13 @@ - + Synopsis #include <ogmrip-chooser-list.h> - OGMRipChooserListPriv; OGMRipChooserList; GtkWidget* ogmrip_chooser_list_new (GType type); @@ -38,14 +37,13 @@ OGMRipSourceType type, GFunc func, gpointer data); - +gint ogmrip_chooser_list_get_n_children (OGMRipChooserList *list); - + Object Hierarchy - GObject +----GInitiallyUnowned +----GtkObject @@ -60,7 +58,7 @@ - + Implemented Interfaces OGMRipChooserList implements @@ -70,16 +68,15 @@ - + Signals - "more-clicked" : Run Last / No Recursion / No Hooks - + Description @@ -88,23 +85,23 @@ - + Details - -<anchor id="OGMRipChooserListPriv" role="struct"/>OGMRipChooserListPriv -OGMRipChooserListPrivtypedef struct _OGMRipChooserListPriv OGMRipChooserListPriv; + +OGMRipChooserListPriv +OGMRipChooserListPrivtypedef struct _OGMRipChooserListPriv OGMRipChooserListPriv; - -<anchor id="OGMRipChooserList-struct" role="struct"/>OGMRipChooserList -OGMRipChooserListtypedef struct _OGMRipChooserList OGMRipChooserList; + +OGMRipChooserList +OGMRipChooserListtypedef struct _OGMRipChooserList OGMRipChooserList; - -<anchor id="ogmrip-chooser-list-new" role="function"/>ogmrip_chooser_list_new () -ogmrip_chooser_list_newGtkWidget* ogmrip_chooser_list_new (GType type); + +ogmrip_chooser_list_new () +ogmrip_chooser_list_newGtkWidget* ogmrip_chooser_list_new (GType type); Creates a new OGMRipChooserList. @@ -116,9 +113,9 @@ Returns : The new OGMRipChooserList - -<anchor id="ogmrip-chooser-list-set-max" role="function"/>ogmrip_chooser_list_set_max () -ogmrip_chooser_list_set_maxvoid ogmrip_chooser_list_set_max (OGMRipChooserList *list, + +ogmrip_chooser_list_set_max () +ogmrip_chooser_list_set_maxvoid ogmrip_chooser_list_set_max (OGMRipChooserList *list, guint max); Creates a new OGMRipChooserList. @@ -132,9 +129,9 @@ the maximum number of children - -<anchor id="ogmrip-chooser-list-get-max" role="function"/>ogmrip_chooser_list_get_max () -ogmrip_chooser_list_get_maxgint ogmrip_chooser_list_get_max (OGMRipChooserList *list); + +ogmrip_chooser_list_get_max () +ogmrip_chooser_list_get_maxgint ogmrip_chooser_list_get_max (OGMRipChooserList *list); Returns the maximum number of children. @@ -146,9 +143,9 @@ Returns : the maximum number of children, or -1 - -<anchor id="ogmrip-chooser-list-clear" role="function"/>ogmrip_chooser_list_clear () -ogmrip_chooser_list_clearvoid ogmrip_chooser_list_clear (OGMRipChooserList *list); + +ogmrip_chooser_list_clear () +ogmrip_chooser_list_clearvoid ogmrip_chooser_list_clear (OGMRipChooserList *list); Removes all children of list. @@ -158,9 +155,9 @@ An OGMRipChooserList - -<anchor id="ogmrip-chooser-list-add" role="function"/>ogmrip_chooser_list_add () -ogmrip_chooser_list_addvoid ogmrip_chooser_list_add (OGMRipChooserList *list, + +ogmrip_chooser_list_add () +ogmrip_chooser_list_addvoid ogmrip_chooser_list_add (OGMRipChooserList *list, GtkWidget *chooser); Adds chooser to list. @@ -174,9 +171,9 @@ A chooser to be placed inside list - -<anchor id="ogmrip-chooser-list-remove" role="function"/>ogmrip_chooser_list_remove () -ogmrip_chooser_list_removevoid ogmrip_chooser_list_remove (OGMRipChooserList *list, + +ogmrip_chooser_list_remove () +ogmrip_chooser_list_removevoid ogmrip_chooser_list_remove (OGMRipChooserList *list, GtkWidget *chooser); Removes chooser from list. @@ -190,9 +187,9 @@ Â current child of list - -<anchor id="ogmrip-chooser-list-foreach" role="function"/>ogmrip_chooser_list_foreach () -ogmrip_chooser_list_foreachvoid ogmrip_chooser_list_foreach (OGMRipChooserList *list, + +ogmrip_chooser_list_foreach () +ogmrip_chooser_list_foreachvoid ogmrip_chooser_list_foreach (OGMRipChooserList *list, OGMRipSourceType type, GFunc func, gpointer data); @@ -214,13 +211,27 @@ Callback user data + +ogmrip_chooser_list_get_n_children () +ogmrip_chooser_list_get_n_childrengint ogmrip_chooser_list_get_n_children (OGMRipChooserList *list); + +Returns the number of valid source choosers contained in list. + + + +list : + An OGMRipChooserList + +Returns : The number of valid choosers, or -1 + + - + Signal Details -<anchor id="OGMRipChooserList-more-clicked"/>The "more-clicked" signal -OGMRipChooserList::more-clickedvoid user_function (OGMRipChooserList *list, +The <literal>"more-clicked"</literal> signal +OGMRipChooserList::more-clickedvoid user_function (OGMRipChooserList *list, OGMRipSourceChooser *chooser, gpointer user_data) : Run Last / No Recursion / No Hooks diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/xml/ogmrip-helper.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/xml/ogmrip-helper.xml --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/xml/ogmrip-helper.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/xml/ogmrip-helper.xml 2008-09-28 19:28:16.000000000 +0200 @@ -4,7 +4,7 @@ -Helper +Helper 3 OGMRIP-GTK Library @@ -15,14 +15,13 @@ - + Synopsis #include <ogmrip-source-chooser.h> - #define GTK_BOX_CHILD (b) #define OGMRIP_ERROR gchar* g_get_locale (gint category); @@ -61,7 +60,7 @@ - + Description @@ -70,11 +69,11 @@ - + Details - -<anchor id="GTK-BOX-CHILD:CAPS" role="macro"/>GTK_BOX_CHILD() -GTK_BOX_CHILD#define GTK_BOX_CHILD(b) ((GtkBoxChild *) (b)) + +GTK_BOX_CHILD() +GTK_BOX_CHILD#define GTK_BOX_CHILD(b) ((GtkBoxChild *) (b)) @@ -85,16 +84,16 @@ - -<anchor id="OGMRIP-ERROR:CAPS" role="macro"/>OGMRIP_ERROR -OGMRIP_ERROR#define OGMRIP_ERROR ogmrip_error_quark () + +OGMRIP_ERROR +OGMRIP_ERROR#define OGMRIP_ERROR ogmrip_error_quark () - -<anchor id="g-get-locale" role="function"/>g_get_locale () -g_get_localegchar* g_get_locale (gint category); + +g_get_locale () +g_get_localegchar* g_get_locale (gint category); Returns the active source and its type. @@ -106,9 +105,9 @@ Returns : The active OGMRipSource - -<anchor id="gtk-window-set-parent" role="function"/>gtk_window_set_parent () -gtk_window_set_parentvoid gtk_window_set_parent (GtkWindow *window, + +gtk_window_set_parent () +gtk_window_set_parentvoid gtk_window_set_parent (GtkWindow *window, GtkWindow *parent); Sets a parent window for a window. This is equivalent to calling @@ -126,9 +125,9 @@ The parent window - -<anchor id="gtk-window-set-icon-from-stock" role="function"/>gtk_window_set_icon_from_stock () -gtk_window_set_icon_from_stockvoid gtk_window_set_icon_from_stock (GtkWindow *window, + +gtk_window_set_icon_from_stock () +gtk_window_set_icon_from_stockvoid gtk_window_set_icon_from_stock (GtkWindow *window, const gchar *stock_id); Sets the icon of window from a stock item. @@ -142,9 +141,9 @@ the name of the stock item - -<anchor id="gtk-button-new-with-image" role="function"/>gtk_button_new_with_image () -gtk_button_new_with_imageGtkWidget* gtk_button_new_with_image (const gchar *text, + +gtk_button_new_with_image () +gtk_button_new_with_imageGtkWidget* gtk_button_new_with_image (const gchar *text, const gchar *stock_id); Creates a new GtkButton containing the given text and the image from a stock item. @@ -160,9 +159,9 @@ Returns : A new GtkButton - -<anchor id="gtk-radio-button-get-active" role="function"/>gtk_radio_button_get_active () -gtk_radio_button_get_activegint gtk_radio_button_get_active (GtkRadioButton *radio); + +gtk_radio_button_get_active () +gtk_radio_button_get_activegint gtk_radio_button_get_active (GtkRadioButton *radio); Returns the index of the active GtkRadioButton. @@ -174,9 +173,9 @@ Returns : An integer, or -1 - -<anchor id="gtk-radio-button-set-active" role="function"/>gtk_radio_button_set_active () -gtk_radio_button_set_activevoid gtk_radio_button_set_active (GtkRadioButton *radio, + +gtk_radio_button_set_active () +gtk_radio_button_set_activevoid gtk_radio_button_set_active (GtkRadioButton *radio, guint index); Sets the active item of the radio group. @@ -190,9 +189,9 @@ The index of the active item - -<anchor id="gtk-tree-model-iter-prev" role="function"/>gtk_tree_model_iter_prev () -gtk_tree_model_iter_prevgboolean gtk_tree_model_iter_prev (GtkTreeModel *tree_model, + +gtk_tree_model_iter_prev () +gtk_tree_model_iter_prevgboolean gtk_tree_model_iter_prev (GtkTreeModel *tree_model, GtkTreeIter *iter); Sets iter to point to the node preceding it at the current level. @@ -209,9 +208,9 @@ Returns : TRUE, if iter has been changed to the previous node - -<anchor id="gtk-label-set-int" role="function"/>gtk_label_set_int () -gtk_label_set_intvoid gtk_label_set_int (GtkLabel *label, + +gtk_label_set_int () +gtk_label_set_intvoid gtk_label_set_int (GtkLabel *label, gint value); Sets the value of a GtkLabel widget. @@ -225,9 +224,9 @@ An integer - -<anchor id="gtk-label-get-int" role="function"/>gtk_label_get_int () -gtk_label_get_intgint gtk_label_get_int (GtkLabel *label); + +gtk_label_get_int () +gtk_label_get_intgint gtk_label_get_int (GtkLabel *label); Gets the value of the label represented as an integer. @@ -239,9 +238,9 @@ Returns : The value of the label widget - -<anchor id="gtk-box-get-nth-child" role="function"/>gtk_box_get_nth_child () -gtk_box_get_nth_childGtkWidget* gtk_box_get_nth_child (GtkBox *box, + +gtk_box_get_nth_child () +gtk_box_get_nth_childGtkWidget* gtk_box_get_nth_child (GtkBox *box, gint n); Returns the n'th item in box. @@ -257,9 +256,9 @@ Returns : The nth GtkWidget, or NULL - -<anchor id="ogmrip-message-dialog-new" role="function"/>ogmrip_message_dialog_new () -ogmrip_message_dialog_newGtkWidget* ogmrip_message_dialog_new (GtkWindow *parent, + +ogmrip_message_dialog_new () +ogmrip_message_dialog_newGtkWidget* ogmrip_message_dialog_new (GtkWindow *parent, GtkMessageType type, const gchar *format, ...); @@ -285,9 +284,9 @@ Returns : A new GtkMessageDialog - -<anchor id="ogmrip-message-dialog" role="function"/>ogmrip_message_dialog () -ogmrip_message_dialoggint ogmrip_message_dialog (GtkWindow *parent, + +ogmrip_message_dialog () +ogmrip_message_dialoggint ogmrip_message_dialog (GtkWindow *parent, GtkMessageType type, const gchar *format, ...); diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/xml/ogmrip-options-plugins.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/xml/ogmrip-options-plugins.xml --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/xml/ogmrip-options-plugins.xml 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/xml/ogmrip-options-plugins.xml 2008-09-28 19:28:16.000000000 +0200 @@ -0,0 +1,410 @@ + + + + + +ogmrip-options-plugins +3 +OGMRIP-GTK Library + + + +ogmrip-options-plugins + + + + + +Synopsis + + + OGMRipContainerOptionsPlugin; + OGMRipVideoOptionsPlugin; + OGMRipAudioOptionsPlugin; + OGMRipSubpOptionsPlugin; +enum OGMRipVideoPreset; +void ogmrip_options_plugin_init (void); +void ogmrip_options_plugin_uninit (void); +gboolean ogmrip_options_plugin_exists (GType type); +GtkWidget* ogmrip_container_options_plugin_dialog_new + (GType type, + const gchar *profile); +void ogmrip_container_options_plugin_set_options + (OGMRipContainer *container); +GtkWidget* ogmrip_video_options_plugin_dialog_new + (GType type, + const gchar *profile); +void ogmrip_video_options_plugin_set_options + (OGMRipVideoCodec *codec); +GtkWidget* ogmrip_audio_options_plugin_dialog_new + (GType type, + const gchar *profile); +void ogmrip_audio_options_plugin_set_options + (OGMRipAudioCodec *codec); +GtkWidget* ogmrip_subp_options_plugin_dialog_new + (GType type, + const gchar *profile); +void ogmrip_subp_options_plugin_set_options + (OGMRipSubpCodec *codec); + + + + + + + + + + + + +Description + + + + + + +Details + +OGMRipContainerOptionsPlugin +OGMRipContainerOptionsPlugintypedef struct { + GModule *module; + GType dialog; + GType type; + void (* set_options) (OGMRipContainer *container); +} OGMRipContainerOptionsPlugin; + + +A structure describing an options plugin for a container + + + + +GModule *module; + For internal use only + + + +GType dialog; + The type of the dialog + + + +GType type; + The type of the associated container + + + +set_options () + The function that will propagate the options to the container + + + + +OGMRipVideoOptionsPlugin +OGMRipVideoOptionsPlugintypedef struct { + GModule *module; + GType dialog; + GType type; + void (* set_options) (OGMRipVideoCodec *video_codec); +} OGMRipVideoOptionsPlugin; + + +A structure describing an options plugin for a video codec + + + + +GModule *module; + For internal use only + + + +GType dialog; + The type of the dialog + + + +GType type; + The type of the associated video codec + + + +set_options () + The function that will propagate the options to the video codec + + + + +OGMRipAudioOptionsPlugin +OGMRipAudioOptionsPlugintypedef struct { + GModule *module; + GType dialog; + GType type; + void (* set_options) (OGMRipAudioCodec *codec); +} OGMRipAudioOptionsPlugin; + + +A structure describing an options plugin for a video codec + + + + +GModule *module; + For internal use only + + + +GType dialog; + The type of the dialog + + + +GType type; + The type of the associated video codec + + + +set_options () + The function that will propagate the options to the video codec + + + + +OGMRipSubpOptionsPlugin +OGMRipSubpOptionsPlugintypedef struct { + GModule *module; + GType dialog; + GType type; + void (* set_options) (OGMRipSubpCodec *codec); +} OGMRipSubpOptionsPlugin; + + +A structure describing an options plugin for a video codec + + + + +GModule *module; + For internal use only + + + +GType dialog; + The type of the dialog + + + +GType type; + The type of the associated video codec + + + +set_options () + The function that will propagate the options to the video codec + + + + +enum OGMRipVideoPreset +OGMRipVideoPresettypedef enum +{ + OGMRIP_VIDEO_PRESET_EXTREME, + OGMRIP_VIDEO_PRESET_HIGH, + OGMRIP_VIDEO_PRESET_NORMAL, + OGMRIP_VIDEO_PRESET_USER +} OGMRipVideoPreset; + + +Available video presets. + + + + +OGMRIP_VIDEO_PRESET_EXTREME + Extreme preset + + + +OGMRIP_VIDEO_PRESET_HIGH + High preset + + + +OGMRIP_VIDEO_PRESET_NORMAL + Normal preset + + + +OGMRIP_VIDEO_PRESET_USER + User defined preset + + + + +ogmrip_options_plugin_init () +ogmrip_options_plugin_initvoid ogmrip_options_plugin_init (void); + +Initializes the plugin system. + + + + +ogmrip_options_plugin_uninit () +ogmrip_options_plugin_uninitvoid ogmrip_options_plugin_uninit (void); + +Uninitializes the plugin system. + + + + +ogmrip_options_plugin_exists () +ogmrip_options_plugin_existsgboolean ogmrip_options_plugin_exists (GType type); + +Checks wether a plugin exists for the codec or container. + + + +type : + The type of a codec or a container + +Returns : TRUE or FALSE + + + +ogmrip_container_options_plugin_dialog_new () +ogmrip_container_options_plugin_dialog_newGtkWidget* ogmrip_container_options_plugin_dialog_new + (GType type, + const gchar *profile); + +Creates a new GtkDialog to configure the container. + + + +type : + The type of a container + +profile : + The current profile + +Returns : a new GtkDialog + + + +ogmrip_container_options_plugin_set_options () +ogmrip_container_options_plugin_set_optionsvoid ogmrip_container_options_plugin_set_options + (OGMRipContainer *container); + +Propagates the options to container. + + + +container : + The OGMRipContainer to set the options to + + + +ogmrip_video_options_plugin_dialog_new () +ogmrip_video_options_plugin_dialog_newGtkWidget* ogmrip_video_options_plugin_dialog_new + (GType type, + const gchar *profile); + +Creates a new GtkDialog to configure the codec. + + + +type : + The type of a video codec + +profile : + The current profile + +Returns : a new GtkDialog + + + +ogmrip_video_options_plugin_set_options () +ogmrip_video_options_plugin_set_optionsvoid ogmrip_video_options_plugin_set_options + (OGMRipVideoCodec *codec); + +Propagates the options to codec. + + + +codec : + The OGMRipVideoCodec to set the options to + + + +ogmrip_audio_options_plugin_dialog_new () +ogmrip_audio_options_plugin_dialog_newGtkWidget* ogmrip_audio_options_plugin_dialog_new + (GType type, + const gchar *profile); + +Creates a new GtkDialog to configure the codec. + + + +type : + The type of a audio codec + +profile : + The current profile + +Returns : a new GtkDialog + + + +ogmrip_audio_options_plugin_set_options () +ogmrip_audio_options_plugin_set_optionsvoid ogmrip_audio_options_plugin_set_options + (OGMRipAudioCodec *codec); + +Propagates the options to codec. + + + +codec : + The OGMRipAudioCodec to set the options to + + + +ogmrip_subp_options_plugin_dialog_new () +ogmrip_subp_options_plugin_dialog_newGtkWidget* ogmrip_subp_options_plugin_dialog_new + (GType type, + const gchar *profile); + +Creates a new GtkDialog to configure the codec. + + + +type : + The type of a subp codec + +profile : + The current profile + +Returns : a new GtkDialog + + + +ogmrip_subp_options_plugin_set_options () +ogmrip_subp_options_plugin_set_optionsvoid ogmrip_subp_options_plugin_set_options + (OGMRipSubpCodec *codec); + +Propagates the options to codec. + + + +codec : + The OGMRipSubpCodec to set the options to + + + + + + + + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/xml/ogmrip-preferences.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/xml/ogmrip-preferences.xml --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/xml/ogmrip-preferences.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/xml/ogmrip-preferences.xml 2008-09-28 19:28:16.000000000 +0200 @@ -4,7 +4,7 @@ -Preferences +Preferences 3 OGMRIP-GTK Library @@ -15,24 +15,29 @@ - + Synopsis #include <ogmrip-preferences.h> - GConfValue* (*OGMRipPrefGetFunc) (GtkWidget *widget); gboolean (*OGMRipPrefSetFunc) (GtkWidget *widget, GConfValue *value); void ogmrip_preferences_init (const gchar *dir); void ogmrip_preferences_uninit (void); GConfValue* ogmrip_preferences_get (const gchar *key); +void ogmrip_preferences_set (const gchar *key, + GConfValue *value); gboolean ogmrip_preferences_get_bool (const gchar *key, gboolean def); void ogmrip_preferences_set_bool (const gchar *key, gboolean value); +gdouble ogmrip_preferences_get_double (const gchar *key, + gdouble def); +void ogmrip_preferences_set_double (const gchar *key, + gdouble value); gint ogmrip_preferences_get_int (const gchar *key, gint def); void ogmrip_preferences_set_int (const gchar *key, @@ -88,6 +93,12 @@ const gchar *key, OGMRipPrefGetFunc get_func, OGMRipPrefSetFunc set_func); +GSList* ogmrip_preferences_all_dirs (const gchar *dir); +GSList* ogmrip_preferences_all_entries (const gchar *dir); +gboolean ogmrip_preferences_dir_exists (const gchar *dir); +void ogmrip_preferences_recursive_unset (const gchar *key); +void ogmrip_preferences_set_default_dir (const gchar *dir); +void ogmrip_preferences_unset (const gchar *key); @@ -99,7 +110,7 @@ - + Description @@ -108,11 +119,11 @@ - + Details - -<anchor id="OGMRipPrefGetFunc" role="function"/>OGMRipPrefGetFunc () -OGMRipPrefGetFuncGConfValue* (*OGMRipPrefGetFunc) (GtkWidget *widget); + +OGMRipPrefGetFunc () +OGMRipPrefGetFuncGConfValue* (*OGMRipPrefGetFunc) (GtkWidget *widget); @@ -124,9 +135,9 @@ - -<anchor id="OGMRipPrefSetFunc" role="function"/>OGMRipPrefSetFunc () -OGMRipPrefSetFuncgboolean (*OGMRipPrefSetFunc) (GtkWidget *widget, + +OGMRipPrefSetFunc () +OGMRipPrefSetFuncgboolean (*OGMRipPrefSetFunc) (GtkWidget *widget, GConfValue *value); @@ -142,9 +153,9 @@ - -<anchor id="ogmrip-preferences-init" role="function"/>ogmrip_preferences_init () -ogmrip_preferences_initvoid ogmrip_preferences_init (const gchar *dir); + +ogmrip_preferences_init () +ogmrip_preferences_initvoid ogmrip_preferences_init (const gchar *dir); Initialize the preferences system and add add a directory to the list of directories to watch. @@ -155,17 +166,17 @@ directory to add to the list - -<anchor id="ogmrip-preferences-uninit" role="function"/>ogmrip_preferences_uninit () -ogmrip_preferences_uninitvoid ogmrip_preferences_uninit (void); + +ogmrip_preferences_uninit () +ogmrip_preferences_uninitvoid ogmrip_preferences_uninit (void); Uninitialize the preferences system. - -<anchor id="ogmrip-preferences-get" role="function"/>ogmrip_preferences_get () -ogmrip_preferences_getGConfValue* ogmrip_preferences_get (const gchar *key); + +ogmrip_preferences_get () +ogmrip_preferences_getGConfValue* ogmrip_preferences_get (const gchar *key); Gets the value of a configuration key. @@ -177,9 +188,25 @@ Returns : newly-allocated GConfValue, or NULL if unset and no default exists - -<anchor id="ogmrip-preferences-get-bool" role="function"/>ogmrip_preferences_get_bool () -ogmrip_preferences_get_boolgboolean ogmrip_preferences_get_bool (const gchar *key, + +ogmrip_preferences_set () +ogmrip_preferences_setvoid ogmrip_preferences_set (const gchar *key, + GConfValue *value); + +Sets the value of a configuration key. + + + +key : + key to set + +value : + new value + + + +ogmrip_preferences_get_bool () +ogmrip_preferences_get_boolgboolean ogmrip_preferences_get_bool (const gchar *key, gboolean def); Requests the boolean value stored at key. @@ -195,9 +222,9 @@ Returns : the value of key, or def if no value was stored - -<anchor id="ogmrip-preferences-set-bool" role="function"/>ogmrip_preferences_set_bool () -ogmrip_preferences_set_boolvoid ogmrip_preferences_set_bool (const gchar *key, + +ogmrip_preferences_set_bool () +ogmrip_preferences_set_boolvoid ogmrip_preferences_set_bool (const gchar *key, gboolean value); Change the value of key to val. Automatically creates the key if it didn't @@ -212,9 +239,44 @@ new value of key - -<anchor id="ogmrip-preferences-get-int" role="function"/>ogmrip_preferences_get_int () -ogmrip_preferences_get_intgint ogmrip_preferences_get_int (const gchar *key, + +ogmrip_preferences_get_double () +ogmrip_preferences_get_doublegdouble ogmrip_preferences_get_double (const gchar *key, + gdouble def); + +Requests the double value stored at key. + + + +key : + key to get + +def : + default value + +Returns : the value of key, or def if no value was stored + + + +ogmrip_preferences_set_double () +ogmrip_preferences_set_doublevoid ogmrip_preferences_set_double (const gchar *key, + gdouble value); + +Change the value of key to val. Automatically creates the key if it didn't +exist before. + + + +key : + key you want to set the value of + +value : + new value of key + + + +ogmrip_preferences_get_int () +ogmrip_preferences_get_intgint ogmrip_preferences_get_int (const gchar *key, gint def); Requests the integer value stored at key. @@ -230,9 +292,9 @@ Returns : the value of key, or def if no value was stored - -<anchor id="ogmrip-preferences-set-int" role="function"/>ogmrip_preferences_set_int () -ogmrip_preferences_set_intvoid ogmrip_preferences_set_int (const gchar *key, + +ogmrip_preferences_set_int () +ogmrip_preferences_set_intvoid ogmrip_preferences_set_int (const gchar *key, gint value); Change the value of key to val. Automatically creates the key if it didn't @@ -247,9 +309,9 @@ new value of key - -<anchor id="ogmrip-preferences-get-string" role="function"/>ogmrip_preferences_get_string () -ogmrip_preferences_get_stringgchar* ogmrip_preferences_get_string (const gchar *key, + +ogmrip_preferences_get_string () +ogmrip_preferences_get_stringgchar* ogmrip_preferences_get_string (const gchar *key, const gchar *def); Requests the string value stored at key. @@ -265,9 +327,9 @@ Returns : the value of key, or def if no value was stored - -<anchor id="ogmrip-preferences-set-string" role="function"/>ogmrip_preferences_set_string () -ogmrip_preferences_set_stringvoid ogmrip_preferences_set_string (const gchar *key, + +ogmrip_preferences_set_string () +ogmrip_preferences_set_stringvoid ogmrip_preferences_set_string (const gchar *key, const gchar *value); Change the value of key to val. Automatically creates the key if it didn't @@ -282,9 +344,9 @@ new value of key - -<anchor id="ogmrip-preferences-get-filename" role="function"/>ogmrip_preferences_get_filename () -ogmrip_preferences_get_filenamegchar* ogmrip_preferences_get_filename (const gchar *key, + +ogmrip_preferences_get_filename () +ogmrip_preferences_get_filenamegchar* ogmrip_preferences_get_filename (const gchar *key, const gchar *def); Requests the filename value stored at key. @@ -300,9 +362,9 @@ Returns : the value of key, or def if no value was stored - -<anchor id="ogmrip-preferences-set-filename" role="function"/>ogmrip_preferences_set_filename () -ogmrip_preferences_set_filenamevoid ogmrip_preferences_set_filename (const gchar *key, + +ogmrip_preferences_set_filename () +ogmrip_preferences_set_filenamevoid ogmrip_preferences_set_filename (const gchar *key, const gchar *value); Change the value of key to val. Automatically creates the key if it didn't @@ -317,9 +379,9 @@ new value of key - -<anchor id="ogmrip-preferences-add-notify" role="function"/>ogmrip_preferences_add_notify () -ogmrip_preferences_add_notifyguint ogmrip_preferences_add_notify (const gchar *key, + +ogmrip_preferences_add_notify () +ogmrip_preferences_add_notifyguint ogmrip_preferences_add_notify (const gchar *key, GFunc func, gpointer data); @@ -340,9 +402,9 @@ Returns : a connection ID for removing the notification - -<anchor id="ogmrip-preferences-add-notify-while-alive" role="function"/>ogmrip_preferences_add_notify_while_alive () -ogmrip_preferences_add_notify_while_aliveguint ogmrip_preferences_add_notify_while_alive + +ogmrip_preferences_add_notify_while_alive () +ogmrip_preferences_add_notify_while_aliveguint ogmrip_preferences_add_notify_while_alive (const gchar *key, GFunc func, gpointer data, @@ -369,9 +431,9 @@ Returns : a connection ID for removing the notification - -<anchor id="ogmrip-preferences-connect-toggle" role="function"/>ogmrip_preferences_connect_toggle () -ogmrip_preferences_connect_togglevoid ogmrip_preferences_connect_toggle (GtkWidget *toggle, + +ogmrip_preferences_connect_toggle () +ogmrip_preferences_connect_togglevoid ogmrip_preferences_connect_toggle (GtkWidget *toggle, const gchar *key); Connects toggle to key. key must be associated to a boolean value. @@ -386,9 +448,9 @@ The associated key - -<anchor id="ogmrip-preferences-connect-toggle-custom" role="function"/>ogmrip_preferences_connect_toggle_custom () -ogmrip_preferences_connect_toggle_customvoid ogmrip_preferences_connect_toggle_custom + +ogmrip_preferences_connect_toggle_custom () +ogmrip_preferences_connect_toggle_customvoid ogmrip_preferences_connect_toggle_custom (GtkWidget *toggle, const gchar *key, OGMRipPrefGetFunc get_func, @@ -413,9 +475,9 @@ The function to set the state of toggle - -<anchor id="ogmrip-preferences-connect-combo" role="function"/>ogmrip_preferences_connect_combo () -ogmrip_preferences_connect_combovoid ogmrip_preferences_connect_combo (GtkWidget *combo, + +ogmrip_preferences_connect_combo () +ogmrip_preferences_connect_combovoid ogmrip_preferences_connect_combo (GtkWidget *combo, const gchar *key); Connects combo to key. key must be associated to an integer value. @@ -430,9 +492,9 @@ The associated key - -<anchor id="ogmrip-preferences-connect-combo-custom" role="function"/>ogmrip_preferences_connect_combo_custom () -ogmrip_preferences_connect_combo_customvoid ogmrip_preferences_connect_combo_custom + +ogmrip_preferences_connect_combo_custom () +ogmrip_preferences_connect_combo_customvoid ogmrip_preferences_connect_combo_custom (GtkWidget *combo, const gchar *key, OGMRipPrefGetFunc get_func, @@ -457,9 +519,9 @@ The function to set the selected item of combo - -<anchor id="ogmrip-preferences-connect-chooser" role="function"/>ogmrip_preferences_connect_chooser () -ogmrip_preferences_connect_chooservoid ogmrip_preferences_connect_chooser (GtkWidget *chooser, + +ogmrip_preferences_connect_chooser () +ogmrip_preferences_connect_chooservoid ogmrip_preferences_connect_chooser (GtkWidget *chooser, const gchar *key); Connects chooser to key. key must be associated to an integer value. @@ -474,9 +536,9 @@ The associated key - -<anchor id="ogmrip-preferences-connect-chooser-custom" role="function"/>ogmrip_preferences_connect_chooser_custom () -ogmrip_preferences_connect_chooser_customvoid ogmrip_preferences_connect_chooser_custom + +ogmrip_preferences_connect_chooser_custom () +ogmrip_preferences_connect_chooser_customvoid ogmrip_preferences_connect_chooser_custom (GtkWidget *chooser, const gchar *key, OGMRipPrefGetFunc get_func, @@ -501,9 +563,9 @@ The function to set the selected file of chooser - -<anchor id="ogmrip-preferences-connect-spin" role="function"/>ogmrip_preferences_connect_spin () -ogmrip_preferences_connect_spinvoid ogmrip_preferences_connect_spin (GtkWidget *spin, + +ogmrip_preferences_connect_spin () +ogmrip_preferences_connect_spinvoid ogmrip_preferences_connect_spin (GtkWidget *spin, const gchar *key); Connects spin to key. key must be associated to an integer value. @@ -518,9 +580,9 @@ The associated key - -<anchor id="ogmrip-preferences-connect-spin-custom" role="function"/>ogmrip_preferences_connect_spin_custom () -ogmrip_preferences_connect_spin_customvoid ogmrip_preferences_connect_spin_custom + +ogmrip_preferences_connect_spin_custom () +ogmrip_preferences_connect_spin_customvoid ogmrip_preferences_connect_spin_custom (GtkWidget *spin, const gchar *key, OGMRipPrefGetFunc get_func, @@ -545,9 +607,9 @@ The function to set the value of spin - -<anchor id="ogmrip-preferences-connect-radio" role="function"/>ogmrip_preferences_connect_radio () -ogmrip_preferences_connect_radiovoid ogmrip_preferences_connect_radio (GtkWidget *radio, + +ogmrip_preferences_connect_radio () +ogmrip_preferences_connect_radiovoid ogmrip_preferences_connect_radio (GtkWidget *radio, const gchar *key); Connects radio to key. key must be associated to an integer value. @@ -562,9 +624,9 @@ The associated key - -<anchor id="ogmrip-preferences-connect-radio-custom" role="function"/>ogmrip_preferences_connect_radio_custom () -ogmrip_preferences_connect_radio_customvoid ogmrip_preferences_connect_radio_custom + +ogmrip_preferences_connect_radio_custom () +ogmrip_preferences_connect_radio_customvoid ogmrip_preferences_connect_radio_custom (GtkWidget *radio, const gchar *key, OGMRipPrefGetFunc get_func, @@ -589,6 +651,91 @@ The function to set the selected radio + +ogmrip_preferences_all_dirs () +ogmrip_preferences_all_dirsGSList* ogmrip_preferences_all_dirs (const gchar *dir); + +Lists the subdirectories in dir. The returned list contains allocated +strings. Each string is the absolute path of a subdirectory. You should +g_free() each string in the list, then g_slist_free() the list itself. + + + +dir : + directory to get subdirectories from + +Returns : List of allocated subdirectory names + + + +ogmrip_preferences_all_entries () +ogmrip_preferences_all_entriesGSList* ogmrip_preferences_all_entries (const gchar *dir); + +Lists the key-value pairs in dir. Does not list subdirectories; for that use +ogmrip_preferences_all_dirs(). The returned list contains GConfEntry objects. +A GConfEntry contains an absolute key and a value. The list is not recursive, +it contains only the immediate children of dir. To free the returned list, +gconf_entry_free() each list element, then g_slist_free() the list itself. + + + +dir : + directory to get entries from + +Returns : List of GConfEntry + + + +ogmrip_preferences_dir_exists () +ogmrip_preferences_dir_existsgboolean ogmrip_preferences_dir_exists (const gchar *dir); + +Queries whether the directory dir exists in the database. + + + +dir : + directory to check for + +Returns : TRUE or FALSE + + + +ogmrip_preferences_recursive_unset () +ogmrip_preferences_recursive_unsetvoid ogmrip_preferences_recursive_unset (const gchar *key); + +Unsets all keys below key, including key itself. If any unset fails, +continues on to unset as much as it can. + + + +key : + a key or directory name to be unset + + + +ogmrip_preferences_set_default_dir () +ogmrip_preferences_set_default_dirvoid ogmrip_preferences_set_default_dir (const gchar *dir); + +Sets the default preferences directory. + + + +dir : + A preferences directory + + + +ogmrip_preferences_unset () +ogmrip_preferences_unsetvoid ogmrip_preferences_unset (const gchar *key); + +Unsets the value of key; if key is already unset, has no effect. + + + +key : + key to unset + + diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/xml/ogmrip-source-chooser-widget.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/xml/ogmrip-source-chooser-widget.xml --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/xml/ogmrip-source-chooser-widget.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/xml/ogmrip-source-chooser-widget.xml 2008-09-28 19:28:16.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipSourceChooserWidget +OGMRipSourceChooserWidget 3 OGMRIP-GTK Library @@ -15,19 +15,17 @@ - + Synopsis #include <ogmrip-source-chooser-widget.h> - OGMRipSourceChooserWidgetPriv; OGMRipSourceChooserWidget; GtkWidget* ogmrip_audio_chooser_widget_new (void); GtkWidget* ogmrip_subtitle_chooser_widget_new (void); - @@ -39,7 +37,7 @@ - + Description @@ -48,17 +46,17 @@ - + Details - -<anchor id="OGMRipSourceChooserWidgetPriv" role="struct"/>OGMRipSourceChooserWidgetPriv -OGMRipSourceChooserWidgetPrivtypedef struct _OGMRipSourceChooserWidgetPriv OGMRipSourceChooserWidgetPriv; + +OGMRipSourceChooserWidgetPriv +OGMRipSourceChooserWidgetPrivtypedef struct _OGMRipSourceChooserWidgetPriv OGMRipSourceChooserWidgetPriv; - -<anchor id="OGMRipSourceChooserWidget" role="struct"/>OGMRipSourceChooserWidget -OGMRipSourceChooserWidgettypedef struct { + +OGMRipSourceChooserWidget +OGMRipSourceChooserWidgettypedef struct { GtkComboBox parent_instance; OGMRipSourceChooserWidgetPriv *priv; } OGMRipSourceChooserWidget; @@ -66,9 +64,9 @@ - -<anchor id="ogmrip-audio-chooser-widget-new" role="function"/>ogmrip_audio_chooser_widget_new () -ogmrip_audio_chooser_widget_newGtkWidget* ogmrip_audio_chooser_widget_new (void); + +ogmrip_audio_chooser_widget_new () +ogmrip_audio_chooser_widget_newGtkWidget* ogmrip_audio_chooser_widget_new (void); Creates a new OGMRipSourceChooserWidget for audio streams. @@ -77,9 +75,9 @@ Returns : The new OGMRipSourceChooserWidget - -<anchor id="ogmrip-subtitle-chooser-widget-new" role="function"/>ogmrip_subtitle_chooser_widget_new () -ogmrip_subtitle_chooser_widget_newGtkWidget* ogmrip_subtitle_chooser_widget_new (void); + +ogmrip_subtitle_chooser_widget_new () +ogmrip_subtitle_chooser_widget_newGtkWidget* ogmrip_subtitle_chooser_widget_new (void); Creates a new OGMRipSourceChooserWidget for subtitles streams. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/reference/ogmrip-gtk/xml/ogmrip-source-chooser.xml /tmp/v6alHitLZN/ogmrip-0.12.2/docs/reference/ogmrip-gtk/xml/ogmrip-source-chooser.xml --- ogmrip-0.11.1/docs/reference/ogmrip-gtk/xml/ogmrip-source-chooser.xml 2007-10-21 21:13:51.000000000 +0200 +++ ogmrip-0.12.2/docs/reference/ogmrip-gtk/xml/ogmrip-source-chooser.xml 2008-09-28 19:28:17.000000000 +0200 @@ -4,7 +4,7 @@ -OGMRipSourceChooser +OGMRipSourceChooser 3 OGMRIP-GTK Library @@ -15,14 +15,13 @@ - + Synopsis #include <ogmrip-source-chooser.h> - enum OGMRipSourceType; OGMRipSourceChooser; OGMRipSourceChooserIface; @@ -34,21 +33,19 @@ void ogmrip_source_chooser_select_language (OGMRipSourceChooser *chooser, gint language); - - + Object Hierarchy - GInterface +----OGMRipSourceChooser - + Prerequisites OGMRipSourceChooser requires @@ -59,10 +56,9 @@ - + Properties - "source" gpointer : Read / Write "title" gpointer : Read / Write @@ -70,7 +66,7 @@ - + Description @@ -79,11 +75,11 @@ - + Details - -<anchor id="OGMRipSourceType" role="enum"/>enum OGMRipSourceType -OGMRipSourceTypetypedef enum + +enum OGMRipSourceType +OGMRipSourceTypetypedef enum { OGMRIP_SOURCE_INVALID = -1, OGMRIP_SOURCE_NONE, @@ -96,36 +92,36 @@ - -OGMRIP_SOURCE_INVALID + +OGMRIP_SOURCE_INVALID This is not a valid source - -OGMRIP_SOURCE_NONE + +OGMRIP_SOURCE_NONE No source is selected - -OGMRIP_SOURCE_STREAM + +OGMRIP_SOURCE_STREAM The source is a DVD stream - -OGMRIP_SOURCE_FILE + +OGMRIP_SOURCE_FILE The source is a file - -<anchor id="OGMRipSourceChooser-struct" role="struct"/>OGMRipSourceChooser -OGMRipSourceChoosertypedef struct _OGMRipSourceChooser OGMRipSourceChooser; + +OGMRipSourceChooser +OGMRipSourceChoosertypedef struct _OGMRipSourceChooser OGMRipSourceChooser; - -<anchor id="OGMRipSourceChooserIface" role="struct"/>OGMRipSourceChooserIface -OGMRipSourceChooserIfacetypedef struct { + +OGMRipSourceChooserIface +OGMRipSourceChooserIfacetypedef struct { GTypeInterface base_iface; void (* set_title) (OGMRipSourceChooser *chooser, @@ -141,9 +137,9 @@ - -<anchor id="ogmrip-source-chooser-set-title" role="function"/>ogmrip_source_chooser_set_title () -ogmrip_source_chooser_set_titlevoid ogmrip_source_chooser_set_title (OGMRipSourceChooser *chooser, + +ogmrip_source_chooser_set_title () +ogmrip_source_chooser_set_titlevoid ogmrip_source_chooser_set_title (OGMRipSourceChooser *chooser, OGMDvdTitle *title); Sets the OGMDvdTitle from which to select the source. @@ -157,9 +153,9 @@ An OGMDvdTitle - -<anchor id="ogmrip-source-chooser-get-title" role="function"/>ogmrip_source_chooser_get_title () -ogmrip_source_chooser_get_titleOGMDvdTitle* ogmrip_source_chooser_get_title (OGMRipSourceChooser *chooser); + +ogmrip_source_chooser_get_title () +ogmrip_source_chooser_get_titleOGMDvdTitle* ogmrip_source_chooser_get_title (OGMRipSourceChooser *chooser); Returns the OGMDvdTitle which was passed to ogmrip_source_chooser_set_title(). @@ -171,9 +167,9 @@ Returns : The current OGMDvdTitle - -<anchor id="ogmrip-source-chooser-get-active" role="function"/>ogmrip_source_chooser_get_active () -ogmrip_source_chooser_get_activeOGMRipSource* ogmrip_source_chooser_get_active (OGMRipSourceChooser *chooser, + +ogmrip_source_chooser_get_active () +ogmrip_source_chooser_get_activeOGMRipSource* ogmrip_source_chooser_get_active (OGMRipSourceChooser *chooser, OGMRipSourceType *type); Returns the active source and its type. @@ -189,9 +185,9 @@ Returns : The active OGMRipSource - -<anchor id="ogmrip-source-chooser-select-language" role="function"/>ogmrip_source_chooser_select_language () -ogmrip_source_chooser_select_languagevoid ogmrip_source_chooser_select_language + +ogmrip_source_chooser_select_language () +ogmrip_source_chooser_select_languagevoid ogmrip_source_chooser_select_language (OGMRipSourceChooser *chooser, gint language); @@ -208,13 +204,13 @@ - + Property Details -<anchor id="OGMRipSourceChooser--source"/>The "<literal>source</literal>" property -OGMRipSourceChooser:source "source" gpointer : Read / Write +The <literal>"source"</literal> property +OGMRipSourceChooser:source "source" gpointer : Read / Write The active source. -<anchor id="OGMRipSourceChooser--title"/>The "<literal>title</literal>" property -OGMRipSourceChooser:title "title" gpointer : Read / Write +The <literal>"title"</literal> property +OGMRipSourceChooser:title "title" gpointer : Read / Write The DVD title. diff -Nru /tmp/NoQs2wYZH4/ogmrip-0.11.1/docs/tutorial/data/html.xsl /tmp/v6alHitLZN/ogmrip-0.12.2/docs/tutorial/data/html.xsl --- ogmrip-0.11.1/docs/tutorial/data/html.xsl 2007-10-07 21:03:53.000000000 +0200 +++ ogmrip-0.12.2/docs/tutorial/data/html.xsl 2008-06-09 21:01:02.000000000 +0200 @@ -2,7 +2,7 @@ - + @@ -21,14 +21,10 @@