Packman Build Service PMBS

LiVES.changes Changed

LiVES.spec Changed

@@ -1,14 +1,13 @@
 # vim: set ts=4 sw=4 et:
 
 Name:           LiVES
-Version:        1.4.7
+Version:        1.4.8
 %define soname 0
 Release:        1
 Summary:        Video Editor and VJ Tool
 License:        GNU General Public License version 2 or later (GPLv2 or later)
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Source0:        http://www.xs4all.nl/%7Esalsaman/lives/current/LiVES-%{version}.tar.bz2
-Patch1:         lives-fix-CODEC_TYPE_VIDEO.patch
 Source99:       LiVES-rpmlintrc
 URL:            http://lives.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
@@ -29,11 +28,13 @@
 BuildRequires:  libogg-devel libvorbis-devel
 BuildRequires:  libtheora-devel
 BuildRequires:  libdv-devel
+BuildRequires:  schroedinger-devel
 BuildRequires:  dirac-devel
 BuildRequires:  libpulse-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libv4l-devel
 BuildRequires:  sox MPlayer cdrkit-cdrtools-compat dvgrab
+BuildRequires:  jack-devel
 Requires:       libvisual libvisual-plugins
 Requires:       sox MPlayer cdrkit-cdrtools-compat dvgrab
 Requires:       libweed%{soname} = %{version}
@@ -69,22 +70,23 @@
 %prep
 %setup -q -n lives-%{version}
 
-%patch1
-
 # fix wrong EOL
 %__sed -i 's/\r$//' weed-docs/*.txt
 
 find . -type d -name .svn | while read d; do %__rm -rf "$d"; done
 
+pushd libweed
+%__ln_s . weed
+popd #libweed
+
 %build
-export CFLAGS="%{optflags} -fno-strict-aliasing"
+export CFLAGS="%{optflags} -fno-strict-aliasing -I$PWD/libweed/"
 export CPPFLAGS="$CFLAGS"
 export CXXFLAGS="$CFLAGS"
 %configure \
-    --disable-doxygen \
-    --disable-jack
+    --disable-doxygen
 
-%__make %{?_smp_flags}
+%__make %{?_smp_mflags}
 
 %install
 %makeinstall
@@ -345,6 +347,9 @@
 %{_libdir}/lives/plugins/playback/video/vloopback.la
 %{_libdir}/lives/plugins/playback/video/yuv4mpeg_stream.so
 %{_libdir}/lives/plugins/playback/video/yuv4mpeg_stream.la
+%{_libdir}/lives/plugins/playback/video/icecast_output.so
+%{_libdir}/lives/plugins/playback/video/icecast_output.la
+
 %files -n libweed%{soname}
 %defattr(-,root,root)
 %{_libdir}/libweed.so.%{soname}
@@ -365,4 +370,6 @@
 %{_libdir}/pkgconfig/libweed_slice.pc
 %{_libdir}/pkgconfig/libweed-utils.pc
 %{_libdir}/pkgconfig/libweed-plugin-utils.pc
+%{_libdir}/pkgconfig/libweed-compat.pc
 
+%changelog

lives-fix-CODEC_TYPE_VIDEO.patch Deleted

LiVES-1.4.7.tar.bz2/ChangeLog -> LiVES-1.4.8.tar.bz2/ChangeLog Changed

LiVES-1.4.7.tar.bz2/LiVES.doxygen -> LiVES-1.4.8.tar.bz2/LiVES.doxygen Changed

LiVES-1.4.7.tar.bz2/Makefile.in -> LiVES-1.4.8.tar.bz2/Makefile.in Changed

@@ -172,6 +172,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -225,6 +226,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -238,6 +241,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -266,6 +270,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -312,6 +318,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -345,7 +352,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/README -> LiVES-1.4.8.tar.bz2/README Changed

LiVES-1.4.7.tar.bz2/RFX/RFX.spec -> LiVES-1.4.8.tar.bz2/RFX/RFX.spec Changed

LiVES-1.4.7.tar.bz2/aclocal.m4 -> LiVES-1.4.8.tar.bz2/aclocal.m4 Changed

@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -156,7 +156,7 @@
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT])[]dnl
+_PKG_TEXT])
         ])
 elif test $pkg_failed = untried; then
      	AC_MSG_RESULT([no])
@@ -167,7 +167,7 @@
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
         ])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

LiVES-1.4.7.tar.bz2/build-lives-rfx-plugin -> LiVES-1.4.8.tar.bz2/build-lives-rfx-plugin Changed

LiVES-1.4.7.tar.bz2/config.guess -> LiVES-1.4.8.tar.bz2/config.guess Changed

@@ -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, 2007, 2008, 2009, 2010
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-12-30'
+timestamp='2009-11-20'
 
 # 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,9 +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, 2006, 2007, 2008, 2009, 2010 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."

LiVES-1.4.7.tar.bz2/config.sub -> LiVES-1.4.8.tar.bz2/config.sub Changed

@@ -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, 2007, 2008, 2009, 2010
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2010-01-22'
+timestamp='2009-11-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -75,9 +75,8 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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."
@@ -381,8 +380,7 @@
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
@@ -1087,11 +1085,6 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
-        # This must be matched before tile*.
-        tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
 		basic_machine=tile-unknown
 		os=-linux-gnu
@@ -1442,8 +1435,6 @@
 	-dicos*)
 		os=-dicos
 		;;
-        -nacl*)
-	        ;;
 	-none)
 		;;
 	*)

LiVES-1.4.7.tar.bz2/configure -> LiVES-1.4.8.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for LiVES 1.4.7.
+# Generated by GNU Autoconf 2.68 for LiVES 1.4.8.
 #
 # Report bugs to <http://www.sourceforge.net/tracker/?group_id=64341&atid=507139>.
 #
@@ -91,6 +91,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -173,7 +174,15 @@
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
@@ -216,11 +225,18 @@
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -529,155 +545,8 @@
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
-
-
-# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-$*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "$0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO

LiVES-1.4.7.tar.bz2/configure.in -> LiVES-1.4.8.tar.bz2/configure.in Changed

@@ -5,7 +5,7 @@
       [m4_pattern_allow([^AC_.*])])
 
 dnl IMPORTANT !! $version must also be set to exactly the same string in smogrify
-AC_INIT(LiVES,1.4.7,http://www.sourceforge.net/tracker/?group_id=64341&atid=507139)
+AC_INIT(LiVES,1.4.8,http://www.sourceforge.net/tracker/?group_id=64341&atid=507139)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
@@ -81,7 +81,7 @@
 AC_DEFINE_UNQUOTED(LiVES_VERSION, "${VERSION}", [])
 
 dnl Add the languages which your application supports here.
-ALL_LINGUAS="ar fr ca cs da ja nl_NL de_DE pt pt_BR hu es it pl tr ru zh_CN sk he en_GB fi et gl uz te ro uk oc hr"
+ALL_LINGUAS="ar fr ca cs da ja nl_NL de_DE pt pt_BR hu es it pl tr ru zh_CN sk he en_GB fi et gl uz te ro uk oc hr ug"
 AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION(0.17)
 
@@ -347,6 +347,7 @@
 
 HAVE_AVCODEC=false
 HAVE_AVFORMAT=false
+HAVE_SWSCALE=false
 
 AC_ARG_ENABLE( ffmpeg, [  --disable-ffmpeg            Disable ffmpeg (avcodec) support.] , disable_ffmpeg=yes)
 if test "x$disable_ffmpeg" != "xyes" ; then
@@ -361,10 +362,15 @@
 AC_SUBST(LIBAVFORMAT_CFLAGS)
 AC_SUBST(LIBAVFORMAT_LIBS)
 
+PKG_CHECK_MODULES(LIBSWSCALE,libswscale,HAVE_SWSCALE=true,HAVE_SWSCALE=false)
+AC_SUBST(LIBSWSCALE_CFLAGS)
+AC_SUBST(LIBSWSCALE_LIBS)
+
 fi
 
 AM_CONDITIONAL(HAVE_AVCODEC,$HAVE_AVCODEC)
 AM_CONDITIONAL(HAVE_AVFORMAT,$HAVE_AVFORMAT)
+AM_CONDITIONAL(HAVE_SWSCALE,$HAVE_SWSCALE)
 
 
 
@@ -381,6 +387,20 @@
 AM_CONDITIONAL(HAVE_MJPEGTOOLS,$HAVE_MJPEGTOOLS)
 
 
+
+HAVE_LIBPNG=false
+AC_ARG_ENABLE( libpng, [  --disable-libpng    Disable direct libpng support.] , disable_libpng=yes)
+if test "x$disable_libpng" != "xyes" ; then
+
+dnl check for mjpegtools
+PKG_CHECK_MODULES(PNG,libpng > 1.2.0,HAVE_LIBPNG=true,HAVE_LIBPNG=false)
+AC_SUBST(PNG_CFLAGS)
+AC_SUBST(PNG_LIBS)
+fi
+
+AM_CONDITIONAL(HAVE_LIBPNG,$HAVE_LIBPNG)
+
+
 HAVE_UNICAP=false
 AC_ARG_ENABLE( unicap, [  --disable-unicap    Disable unicap support.] , disable_unicap=yes)
 if test "x$disable_unicap" != "xyes" ; then
@@ -447,6 +467,7 @@
 
 HAVE_DIRAC=false
 dnl check for dirac
+echo "Checking for Dirac (schroedinger)..."
 PKG_CHECK_MODULES(DIRAC,schroedinger-1.0,HAVE_DIRAC=true,HAVE_DIRAC=false)
 AC_SUBST(DIRAC_CFLAGS)
 AC_SUBST(DIRAC_LIBS)

LiVES-1.4.7.tar.bz2/libOSC/Makefile.in -> LiVES-1.4.8.tar.bz2/libOSC/Makefile.in Changed

@@ -173,6 +173,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -226,6 +227,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -239,6 +242,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -267,6 +271,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -313,6 +319,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -346,7 +353,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/libOSC/client/Makefile.in -> LiVES-1.4.8.tar.bz2/libOSC/client/Makefile.in Changed

@@ -118,6 +118,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -171,6 +172,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -184,6 +187,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -212,6 +216,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -258,6 +264,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -291,7 +298,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/libOSC/sendOSC/Makefile.in -> LiVES-1.4.8.tar.bz2/libOSC/sendOSC/Makefile.in Changed

@@ -119,6 +119,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -172,6 +173,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -185,6 +188,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -213,6 +217,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -259,6 +265,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -292,7 +299,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/libweed/Makefile.am -> LiVES-1.4.8.tar.bz2/libweed/Makefile.am Changed

LiVES-1.4.7.tar.bz2/libweed/Makefile.in -> LiVES-1.4.8.tar.bz2/libweed/Makefile.in Changed

@@ -177,6 +177,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -230,6 +231,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = 
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -243,6 +246,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -271,6 +275,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -317,6 +323,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -350,7 +357,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -376,14 +382,14 @@
 @IS_DARWIN_TRUE@extra_ldflags = 
 @IS_DARWIN_FALSE@extra_cflags = -fPIC -DPIC
 @IS_DARWIN_TRUE@extra_cflags = 
-EXTRA_DIST = libweed.doxygen libweed.pc libweed-plugin-utils.pc libweed_slice.pc libweed-utils.pc
+EXTRA_DIST = libweed.doxygen libweed.pc libweed-plugin-utils.pc libweed_slice.pc libweed-utils.pc libweed-compat.pc
 lib_LTLIBRARIES = libweed.la libweed_slice.la libweed-utils.la libweed-plugin-utils.la
 libweed_la_SOURCES = weed.c
 libweed_slice_la_SOURCES = weed-gslice.c
 libweed_utils_la_SOURCES = weed-utils.c 
 libweed_plugin_utils_la_SOURCES = weed-plugin-utils.c
 libweedinclude_HEADERS = weed.h weed-host.h weed-plugin.h weed-utils.h weed-events.h weed-palettes.h weed-effects.h \
-	weed-plugin-utils.h
+	weed-plugin-utils.h weed-compat.h
 
 libweedincludedir = $(includedir)/weed
 libweed_ladir = $(libdir)/weed

LiVES-1.4.8.tar.bz2/libweed/libweed-compat.pc Added

LiVES-1.4.8.tar.bz2/libweed/weed-compat.h Added

@@ -0,0 +1,166 @@
+/* WEED is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   Weed is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this source code; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+
+
+   Weed is developed by:
+
+   Gabriel "Salsaman" Finch - http://lives.sourceforge.net
+
+   mainly based on LiViDO, which is developed by:
+
+
+   Niels Elburg - http://veejay.sf.net
+
+   Gabriel "Salsaman" Finch - http://lives.sourceforge.net
+
+   Denis "Jaromil" Rojo - http://freej.dyne.org
+
+   Tom Schouten - http://zwizwa.fartit.com
+
+   Andraz Tori - http://cvs.cinelerra.org
+
+   reviewed with suggestions and contributions from:
+
+   Silvano "Kysucix" Galliani - http://freej.dyne.org
+
+   Kentaro Fukuchi - http://megaui.net/fukuchi
+
+   Jun Iio - http://www.malib.net
+
+   Carlo Prelz - http://www2.fluido.as:8080/
+
+*/
+
+/* (C) Gabriel "Salsaman" Finch, 2005 - 2011 */
+
+#ifndef __WEED_COMPAT_H__
+#define __WEED_COMPAT_H__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+#ifdef HAVE_AVCODEC
+
+  // compatibility with libavcodec
+
+#include <libavcodec/avcodec.h>
+
+#ifndef __WEED_PALETTES_H__
+#include <weed/weed-palettes.h>
+#endif
+
+int avi_pix_fmt_to_weed_palette(enum PixelFormat pix_fmt, int *clamped) {
+  // clamped may be set to NULL if you are not interested in the value
+
+  switch (pix_fmt) {
+  case PIX_FMT_RGB24:
+    return WEED_PALETTE_RGB24;
+  case PIX_FMT_BGR24:
+    return WEED_PALETTE_BGR24;
+  case PIX_FMT_RGBA:
+    return WEED_PALETTE_RGBA32;
+  case PIX_FMT_BGRA:
+    return WEED_PALETTE_BGRA32;
+  case PIX_FMT_ARGB:
+    return WEED_PALETTE_ARGB32;
+  case PIX_FMT_YUV444P:
+    return WEED_PALETTE_YUV444P;
+  case PIX_FMT_YUV422P:
+    return WEED_PALETTE_YUV422P;
+  case PIX_FMT_YUV420P:
+    return WEED_PALETTE_YUV420P;
+  case PIX_FMT_YUYV422:
+    return WEED_PALETTE_YUYV;
+  case PIX_FMT_UYVY422:
+    return WEED_PALETTE_UYVY;
+  case PIX_FMT_UYYVYY411:
+    return WEED_PALETTE_YUV411;
+  case PIX_FMT_GRAY8:
+  case PIX_FMT_Y400A:
+    return WEED_PALETTE_A8;
+  case PIX_FMT_MONOWHITE:
+  case PIX_FMT_MONOBLACK:
+    return WEED_PALETTE_A1;
+  case PIX_FMT_YUVJ422P:
+    if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
+    return WEED_PALETTE_YUV422P;
+  case PIX_FMT_YUVJ444P:
+    if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
+    return WEED_PALETTE_YUV444P;
+  case PIX_FMT_YUVJ420P:
+    if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
+    return WEED_PALETTE_YUV420P;
+
+  default:
+    return WEED_PALETTE_END;
+  }
+}
+
+
+
+
+enum PixelFormat weed_palette_to_avi_pix_fmt(int pal, int *clamped) {
+
+  switch (pal) {
+  case WEED_PALETTE_RGB24:
+    return PIX_FMT_RGB24;
+  case WEED_PALETTE_BGR24:
+    return PIX_FMT_BGR24;
+  case WEED_PALETTE_RGBA32:
+    return PIX_FMT_RGBA;
+  case WEED_PALETTE_BGRA32:
+    return PIX_FMT_BGRA;
+  case WEED_PALETTE_ARGB32:
+    return PIX_FMT_ARGB;
+  case WEED_PALETTE_YUV444P:
+    if (clamped && *clamped==WEED_YUV_CLAMPING_UNCLAMPED)
+      return PIX_FMT_YUVJ444P;
+    return PIX_FMT_YUV444P;
+  case WEED_PALETTE_YUV422P:
+    if (clamped && *clamped==WEED_YUV_CLAMPING_UNCLAMPED)
+      return PIX_FMT_YUVJ422P;
+    return PIX_FMT_YUV422P;
+  case WEED_PALETTE_YUV420P:
+    if (clamped && *clamped==WEED_YUV_CLAMPING_UNCLAMPED)
+      return PIX_FMT_YUVJ420P;
+    return PIX_FMT_YUV420P;
+  case WEED_PALETTE_YUYV:
+    return PIX_FMT_YUYV422;
+  case WEED_PALETTE_UYVY:
+    return PIX_FMT_UYVY422;
+  case WEED_PALETTE_YUV411:
+    return PIX_FMT_UYYVYY411;
+
+  case WEED_PALETTE_A8:
+    return PIX_FMT_GRAY8;
+  case WEED_PALETTE_A1:
+    return PIX_FMT_MONOBLACK;
+
+  default:
+    return PIX_FMT_NONE;
+  }
+
+  return PIX_FMT_NONE;
+
+}
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif // #ifndef __WEED_COMPAT_H__

LiVES-1.4.7.tar.bz2/lives-plugins/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/Makefile.in Changed

@@ -132,6 +132,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -185,6 +186,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -198,6 +201,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -226,6 +230,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -272,6 +278,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -305,7 +312,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/icons/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/icons/Makefile.in Changed

@@ -116,6 +116,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -169,6 +170,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -182,6 +185,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -210,6 +214,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -256,6 +262,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -289,7 +296,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/marcos-encoders/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/marcos-encoders/Makefile.in Changed

@@ -118,6 +118,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -171,6 +172,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -184,6 +187,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -212,6 +216,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -258,6 +264,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -291,7 +298,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder -> LiVES-1.4.8.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder Changed

@@ -25,8 +25,9 @@
 version = '0.1.7'
 convert = 'convert'
 mplayer = 'mplayer'
-theora_encoder = 'encoder_example'
+theora_encoder  = 'encoder_example'
 theora_encoder2 = 'theora_encoder_example'
+theora_encoder3 = 'theora_encode'
     
 sox = 'sox'
 identify = 'identify'
@@ -381,6 +382,9 @@
     if which(theora_encoder2) != '':
         theora_encoder = theora_encoder2
 
+    if which(theora_encoder3) != '':
+        theora_encoder = theora_encoder3
+
     fpsnum = fps.split('/')[0]
     fpsden = fps.split('/')[1]
     mplayer_opts = '-mf type=%s:fps=%s ' % (ext[1:],
@@ -521,10 +525,11 @@
     if wprog == '':
         if prog == theora_encoder:
             if which(theora_encoder2) == '':
-                print theora_encoder + ' or ' + theora_encoder2 + ': command not found'
-                raise SystemExit, 1
+                if which(theora_encoder3) == '':
+                    print theora_encoder + ' or ' + theora_encoder2 + ' or ' + theora_encoder3 + ': command not found'
+                    raise SystemExit, 1
         else:
-            if prog != theora_encoder2:
+            if prog != theora_encoder2 and prog != theora_encoder3:
                 print prog + ': command not found'
                 raise SystemExit, 1
         
@@ -582,7 +587,7 @@
     else:
         quiet = False
 
-    for i in [mplayer, theora_encoder, theora_encoder2, sox, convert, identify]:
+    for i in [mplayer, theora_encoder, theora_encoder2, theora_encoder3, sox, convert, identify]:
         is_installed(i)
     if '-C' in opts: raise SystemExit

LiVES-1.4.7.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder3 -> LiVES-1.4.8.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder3 Changed

@@ -25,8 +25,9 @@
 version = '0.1.7'
 convert = 'convert'
 mplayer = 'mplayer'
-theora_encoder = 'encoder_example'
+theora_encoder  = 'encoder_example'
 theora_encoder2 = 'theora_encoder_example'
+theora_encoder3 = 'theora_encode'
     
 sox = 'sox'
 identify = 'identify'
@@ -381,6 +382,9 @@
     if which(theora_encoder2) != '':
         theora_encoder = theora_encoder2
 
+    if which(theora_encoder3) != '':
+        theora_encoder = theora_encoder3
+
     fpsnum = fps.split('/')[0]
     fpsden = fps.split('/')[1]
     mplayer_opts = '-mf type=%s:fps=%s ' % (ext[1:],
@@ -521,10 +525,11 @@
     if wprog == '':
         if prog == theora_encoder:
             if which(theora_encoder2) == '':
-                print(theora_encoder + ' or ' + theora_encoder2 + ': command not found')
-                raise SystemExit(1)
+                if which(theora_encoder3) == '':
+                    print theora_encoder + ' or ' + theora_encoder2 + ' or ' + theora_encoder3 + ': command not found'
+                    raise SystemExit, 1
         else:
-            if prog != theora_encoder2:
+            if prog != theora_encoder2 and prog != theora_encoder3:
                 print(prog + ': command not found')
                 raise SystemExit(1)
         
@@ -582,7 +587,7 @@
     else:
         quiet = False
 
-    for i in [mplayer, theora_encoder, theora_encoder2, sox, convert, identify]:
+    for i in [mplayer, theora_encoder, theora_encoder2, theora_encoder3, sox, convert, identify]:
         is_installed(i)
     if '-C' in opts: raise SystemExit

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/Makefile.in Changed

@@ -132,6 +132,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -185,6 +186,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -198,6 +201,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -226,6 +230,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -272,6 +278,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -305,7 +312,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/decoders/Makefile.am -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/Makefile.am Changed

@@ -51,18 +51,32 @@
 flv_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(FLVDEC_CFLAGS)
 flv_decoder_la_LDFLAGS = $(shared_ldflags) $(FLVDEC_LIBS)
 
-#in progress
 asf_libs = asf_decoder.la
 ASFDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
 ASFDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
 asf_decoder_la_SOURCES = asf_decoder.c asf_decoder.h
 asf_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(ASFDEC_CFLAGS)
 asf_decoder_la_LDFLAGS = $(shared_ldflags) $(ASFDEC_LIBS)
+
+
+#in progress
+
+#does not work - unable to parse video pckets
+
+#avi_libs = avi_decoder.la
+#AVIDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
+#AVIDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
+#avi_decoder_la_SOURCES = avi_decoder.c avi_decoder.h
+#avi_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(AVIDEC_CFLAGS)
+#avi_decoder_la_LDFLAGS = $(shared_ldflags) $(AVIDEC_LIBS)
+
+
+
 endif
 endif
 
 
 
-decoderpluginslib_LTLIBRARIES = $(ogg_libs) $(dv_libs) $(flv_libs) $(asf_libs)
+decoderpluginslib_LTLIBRARIES = $(ogg_libs) $(dv_libs) $(flv_libs) $(asf_libs) #$(avi_libs)
 
 EXTRA_DIST = decplugin.h

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/decoders/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/Makefile.in Changed

@@ -179,6 +179,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -232,6 +233,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = 
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -245,6 +248,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -273,6 +277,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -319,6 +325,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -352,7 +359,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -395,15 +401,24 @@
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@flv_decoder_la_SOURCES = flv_decoder.c flv_decoder.h
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@flv_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(FLVDEC_CFLAGS)
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@flv_decoder_la_LDFLAGS = $(shared_ldflags) $(FLVDEC_LIBS)
-
-#in progress
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@asf_libs = asf_decoder.la
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@ASFDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@ASFDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@asf_decoder_la_SOURCES = asf_decoder.c asf_decoder.h
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@asf_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(ASFDEC_CFLAGS)
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@asf_decoder_la_LDFLAGS = $(shared_ldflags) $(ASFDEC_LIBS)
-decoderpluginslib_LTLIBRARIES = $(ogg_libs) $(dv_libs) $(flv_libs) $(asf_libs)
+
+#in progress
+
+#does not work - unable to parse video pckets
+
+#avi_libs = avi_decoder.la
+#AVIDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
+#AVIDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
+#avi_decoder_la_SOURCES = avi_decoder.c avi_decoder.h
+#avi_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(AVIDEC_CFLAGS)
+#avi_decoder_la_LDFLAGS = $(shared_ldflags) $(AVIDEC_LIBS)
+decoderpluginslib_LTLIBRARIES = $(ogg_libs) $(dv_libs) $(flv_libs) $(asf_libs) #$(avi_libs)
 EXTRA_DIST = decplugin.h
 all: all-am

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.c -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.c Changed

@@ -20,7 +20,14 @@
 #undef HAVE_AV_CONFIG_H
 #endif
 
-#include <libavcodec/avcodec.h>
+#define HAVE_AVCODEC
+
+#ifdef HAVE_SYSTEM_WEED_COMPAT
+#include "weed/weed-compat.h"
+#else
+#include "../../../libweed/weed-compat.h"
+#endif
+
 #include <libavformat/avformat.h>
 #include <libavutil/avstring.h>
 
@@ -49,53 +56,6 @@
 
 ////////////////////////////////////////////////////////////////////////////
 
-static int pix_fmt_to_palette(enum PixelFormat pix_fmt, int *clamped) {
- 
-  switch (pix_fmt) {
-  case PIX_FMT_RGB24:
-    return WEED_PALETTE_RGB24;
-  case PIX_FMT_BGR24:
-    return WEED_PALETTE_BGR24;
-  case PIX_FMT_RGBA:
-    return WEED_PALETTE_RGBA32;
-  case PIX_FMT_BGRA:
-    return WEED_PALETTE_BGRA32;
-  case PIX_FMT_ARGB:
-    return WEED_PALETTE_ARGB32;
-  case PIX_FMT_YUV444P:
-    return WEED_PALETTE_YUV444P;
-  case PIX_FMT_YUV422P:
-    return WEED_PALETTE_YUV422P;
-  case PIX_FMT_YUV420P:
-    return WEED_PALETTE_YUV420P;
-  case PIX_FMT_YUYV422:
-    return WEED_PALETTE_YUYV;
-  case PIX_FMT_UYVY422:
-    return WEED_PALETTE_UYVY;
-  case PIX_FMT_UYYVYY411:
-    return WEED_PALETTE_YUV411;
-  case PIX_FMT_GRAY8:
-  case PIX_FMT_Y400A:
-    return WEED_PALETTE_A8;
-  case PIX_FMT_MONOWHITE:
-  case PIX_FMT_MONOBLACK:
-    return WEED_PALETTE_A1;
-  case PIX_FMT_YUVJ422P:
-    if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
-    return WEED_PALETTE_YUV422P;
-  case PIX_FMT_YUVJ444P:
-    if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
-    return WEED_PALETTE_YUV444P;
-  case PIX_FMT_YUVJ420P:
-    if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
-    return WEED_PALETTE_YUV420P;
-
-  default:
-    return WEED_PALETTE_END;
-  }
-}
-
-
 
 /* can enable this later to handle pix_fmt (35) - YUVA4204P */
 /*
@@ -409,7 +369,7 @@
   uint32_t packet_length, padsize;
   unsigned char buffer[8];
   uint8_t num;
-  uint16_t duration;
+  //uint16_t duration;
   int rsize;
   int streamid;
   int pack_fill=0;
@@ -501,7 +461,7 @@
       }
       priv->input_position+=2;
       
-      duration = get_le16int(buffer);
+      //duration = get_le16int(buffer);
       
       // rsize has at least 11 bytes which have to be present
       
@@ -675,7 +635,7 @@
 	printf("got vid fragment in packet !\n");
 #endif
 
-	if (asf->packet_key_frame&&asf->packet_frag_offset==0) {
+	if (asf->packet_key_frame&&asf->packet_frag_offset==0&&priv->have_start_dts) {
 	  priv->kframe=add_keyframe(cdata,priv->hdr_start,priv->fragnum,asf->packet_frag_timestamp-priv->start_dts);
 #ifdef DEBUG
 	  printf("and is keyframe !\n");
@@ -914,7 +874,7 @@
   cdata->arate=0;
   cdata->achans=0;
   cdata->asamps=0;
-  snprintf(cdata->audio_name,16,"none");
+  sprintf(cdata->audio_name,"none");
 
   priv->idx=NULL;
 
@@ -1031,7 +991,8 @@
       }
       
       priv->input_position+=8;
-      priv->asf->hdr.send_time          = get_le64int(buffer);   // seems to be the duration
+      // seems to be the duration
+      priv->asf->hdr.send_time = get_le64int(buffer);
 
 #ifdef DEBUG
       fprintf(stderr,"hdr says send time is %ld\n",priv->asf->hdr.send_time);
@@ -1103,11 +1064,11 @@
 
     } else if (!guidcmp(&g, &lives_asf_stream_header)) {
       enum LiVESMediaType type;
-      int type_specific_size, sizeX;
-      uint64_t total_size;
+      int sizeX;
+      //uint64_t total_size;
       unsigned int tag1;
       int64_t pos1, pos2, start_time;
-      int test_for_ext_stream_audio, is_dvr_ms_audio=0;
+      int test_for_ext_stream_audio;
 
       pos1 = priv->input_position;
 
@@ -1169,7 +1130,7 @@
       
       priv->input_position+=8;
 
-      total_size = get_le64int(buffer);
+      //      total_size = get_le64int(buffer);
 
       if (read(priv->fd,buffer,4)<4) {
 	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
@@ -1179,7 +1140,7 @@
       
       priv->input_position+=4;
 
-      type_specific_size = get_le32int(buffer);
+      //type_specific_size = get_le32int(buffer);
       
       lseek(priv->fd, 4, SEEK_CUR);
       priv->input_position+=4;
@@ -1205,7 +1166,7 @@
 	
 	if (!guidcmp(&g, &lives_asf_ext_stream_audio_stream)) {
 	  type = LIVES_MEDIA_TYPE_AUDIO;
-	  is_dvr_ms_audio=1;
+	  //is_dvr_ms_audio=1;
 	  get_guid(priv->fd, &g);
 	  priv->input_position+=sizeof(lives_asf_guid);
 
@@ -1221,13 +1182,12 @@
       }
 
 
-
       if (type == LIVES_MEDIA_TYPE_AUDIO) {
 	priv->st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
 	snprintf(cdata->audio_name,16,"unknown");
 
       } else if (type == LIVES_MEDIA_TYPE_VIDEO) {
-	priv->st->codec->codec_type = CODEC_TYPE_VIDEO;
+	priv->st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
 	if (vidindex!=-1&&vidindex!=priv->st->id) {
 	  fprintf(stderr, "asf_decoder: unhandled multiple vidstreams %d and %d in %s\n",vidindex,priv->st->id,cdata->URI);
 	  got_vidst=TRUE;
@@ -1558,7 +1518,7 @@
       }
   
     } else if (!guidcmp(&g, &lives_asf_metadata_header)) {
-      int n, stream_num, name_len, value_len, value_type, value_num;
+      int n, stream_num, name_len, value_len, value_num;
 
       if (read(priv->fd,buffer,2)<2) {
 	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
@@ -1604,7 +1564,7 @@
 	  
 	priv->input_position+=2;
 	
-	value_type= get_le16int(buffer);
+	//value_type= get_le16int(buffer);
 
 	if (read(priv->fd,buffer,4)<4) {
 	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
@@ -1636,8 +1596,11 @@
 	  
 	value_num= get_le16int(buffer);
 
-	//url_fskip(pb, value_len - 2);
-	
+	// check this
+	priv->input_position+=value_len-2;
+	lseek(priv->fd, value_len+2, SEEK_CUR);

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.h -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.h Changed

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/decoders/dv_decoder.c -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/dv_decoder.c Changed

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/decoders/flv_decoder.c -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/flv_decoder.c Changed

@@ -16,59 +16,26 @@
 #undef HAVE_AV_CONFIG_H
 #endif
 
-#include <libavcodec/avcodec.h>
+#ifdef HAVE_AV_CONFIG_H
+#undef HAVE_AV_CONFIG_H
+#endif
+
+#define HAVE_AVCODEC
+
+#ifdef HAVE_SYSTEM_WEED_COMPAT
+#include "weed/weed-compat.h"
+#else
+#include "../../../libweed/weed-compat.h"
+#endif
+
+#include <libavformat/avformat.h>
+#include <libavutil/avstring.h>
 
 #include "decplugin.h"
 #include "flv_decoder.h"
 
 ////////////////////////////////////////////////////////////////////////////
 
-static int pix_fmt_to_palette(enum PixelFormat pix_fmt, int *clamped) {
- 
-    switch (pix_fmt) {
-    case PIX_FMT_RGB24:
-	return WEED_PALETTE_RGB24;
-    case PIX_FMT_BGR24:
-	return WEED_PALETTE_BGR24;
-    case PIX_FMT_RGBA:
-	return WEED_PALETTE_RGBA32;
-    case PIX_FMT_BGRA:
-	return WEED_PALETTE_BGRA32;
-    case PIX_FMT_ARGB:
-	return WEED_PALETTE_ARGB32;
-    case PIX_FMT_YUV444P:
-	return WEED_PALETTE_YUV444P;
-    case PIX_FMT_YUV422P:
-	return WEED_PALETTE_YUV422P;
-    case PIX_FMT_YUV420P:
-	return WEED_PALETTE_YUV420P;
-    case PIX_FMT_YUYV422:
-	return WEED_PALETTE_YUYV;
-    case PIX_FMT_UYVY422:
-	return WEED_PALETTE_UYVY;
-    case PIX_FMT_UYYVYY411:
-	return WEED_PALETTE_YUV411;
-    case PIX_FMT_GRAY8:
-    case PIX_FMT_Y400A:
-	return WEED_PALETTE_A8;
-    case PIX_FMT_MONOWHITE:
-    case PIX_FMT_MONOBLACK:
-	return WEED_PALETTE_A1;
-    case PIX_FMT_YUVJ422P:
-	if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
-	return WEED_PALETTE_YUV422P;
-    case PIX_FMT_YUVJ444P:
-	if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
-	return WEED_PALETTE_YUV444P;
-    case PIX_FMT_YUVJ420P:
-	if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
-	return WEED_PALETTE_YUV420P;
-
-    default:
-	return WEED_PALETTE_END;
-    }
-}
-
 
 
 /* can enable this later to handle pix_fmt (35) - YUVA4204P */
@@ -465,6 +432,7 @@
   if (priv->ctx->extradata==NULL) return AVERROR(ENOMEM);
   priv->ctx->extradata_size = size;
   dummy=read(priv->fd, priv->ctx->extradata, priv->ctx->extradata_size);
+  dummy=dummy; // keep compiler happy
   return 0;
 }
 
@@ -524,11 +492,11 @@
   unsigned char flags,avctype;
   int type,size,vcodec=0,ldts;
   boolean gotmeta=FALSE,in_array=FALSE;
-  boolean haskeyframes=FALSE,canseekend=FALSE,hasaudio;
+  boolean hasaudio;
   boolean got_astream=FALSE,got_vstream=FALSE;
   char *key=NULL;
   size_t offs=0;
-  double num_val,fps,lasttimestamp=-1.;
+  double num_val,fps;
 
   AVCodec *codec=NULL;
   AVCodecContext *ctx;
@@ -682,7 +650,7 @@
 	if (!strcmp(key,"videoframerate")) cdata->fps=num_val;
 	if (!strcmp(key,"audiosamplerate")) cdata->arate=num_val;
 	if (!strcmp(key,"audiosamplesize")) cdata->asamps=num_val;
-	if (!strcmp(key,"lasttimestamp")) lasttimestamp=num_val;
+	//if (!strcmp(key,"lasttimestamp")) lasttimestamp=num_val;
 	if (!strcmp(key,"height")) cdata->height=num_val;
 	if (!strcmp(key,"width")) cdata->width=num_val;
 
@@ -698,10 +666,10 @@
 
 	offs+=1;
 
-	if (!strcmp(key,"hasKeyframes")&&num_val==1.) haskeyframes=TRUE;
-	else if (!strcmp(key,"canSeekToEnd")&&num_val==1.) canseekend=TRUE;
-	else if (!strcmp(key,"hasAudio")&&num_val==0.) hasaudio=FALSE;
-	if (!strcmp(key,"stereo")&&num_val==1.) cdata->achans=2;
+	//if (!strcmp(key,"hasKeyframes")&&num_val==1.) haskeyframes=TRUE;
+	//else if (!strcmp(key,"canSeekToEnd")&&num_val==1.) canseekend=TRUE;
+	if (!strcmp(key,"hasAudio")&&num_val==0.) hasaudio=FALSE;
+	else if (!strcmp(key,"stereo")&&num_val==1.) cdata->achans=2;
 
 	if (key!=NULL) free(key);
 	key=NULL;
@@ -755,6 +723,8 @@
 
   priv->ctx=ctx = avcodec_alloc_context();
 
+  sprintf(cdata->audio_name,"none");
+
   // now we get the stream data
   while (!got_astream || !got_vstream) {
     do {
@@ -1012,7 +982,7 @@
     int len;
 
     // this does not work for h264 and I dont know why not !!!!!!!!!!!!!!!!!!!!
-#if LIBAVCODEC_VERSION_MAJOR >= 53
+#if LIBAVCODEC_VERSION_MAJOR >= 52
     len=avcodec_decode_video2(ctx, priv->picture, &got_picture, &priv->avpkt );
 #else 
     len=avcodec_decode_video(ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
@@ -1089,7 +1059,8 @@
 
   cdata->palettes=(int *)malloc(2*sizeof(int));
 
-  cdata->palettes[0]=pix_fmt_to_palette(ctx->pix_fmt,&cdata->YUV_clamping);
+  cdata->palettes[0]=avi_pix_fmt_to_weed_palette(ctx->pix_fmt,
+						 &cdata->YUV_clamping);
   cdata->palettes[1]=WEED_PALETTE_END;
 
   if (cdata->palettes[0]==WEED_PALETTE_END) {
@@ -1463,8 +1434,10 @@
 	priv->avpkt.size-=len;
 	priv->avpkt.data+=len;
 
-	if (!got_picture&&priv->avpkt.size<=0) return FALSE;
-
+	if (!got_picture&&priv->avpkt.size<=0) {
+	  free(pack.data);
+	  return FALSE;
+	}
       }
 
       free(pack.data);

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/decoders/ogg_decoder.c -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/ogg_decoder.c Changed

@@ -533,8 +533,6 @@
   uint8_t isubminor;
 #endif
 
-  uint32_t iprof,ilevel;
-
   lives_ogg_priv_t *priv=(lives_ogg_priv_t *)cdata->priv;
   ogg_t *opriv=priv->opriv;
 
@@ -690,8 +688,8 @@
 
       imajor=dirac_uint( &bs ); /* major_version */
       iminor=dirac_uint( &bs ); /* minor_version */
-      iprof=dirac_uint( &bs ); /* profile */
-      ilevel=dirac_uint( &bs ); /* level */
+      //iprof=dirac_uint( &bs ); /* profile */
+      //ilevel=dirac_uint( &bs ); /* level */
 
       priv->vstream->version=imajor*1000000+iminor*1000;
 
@@ -1069,14 +1067,14 @@
   int64_t page_pos, start_pos;
   int64_t this_frame=0, last_frame = -1;
   int64_t this_kframe=0;
-  int64_t pos1,pos2,serialno;
+  int64_t pos1,pos2;
 
   lives_ogg_priv_t *priv=(lives_ogg_priv_t *)cdata->priv;
   ogg_t *opriv=priv->opriv;
 
   pos1=vstream->data_start;
   pos2=opriv->total_bytes;
-  serialno=vstream->stream_id;
+  //serialno=vstream->stream_id;
 
   start_pos = pos2 - BYTES_TO_READ;
 
@@ -1403,14 +1401,14 @@
 static int64_t find_last_sync_frame (lives_clip_data_t *cdata, lives_in_stream *vstream) {
   int64_t page_pos, last_page_pos = -1, start_pos;
   int64_t this_frame=-1;
-  int64_t pos1,pos2,serialno;
+  int64_t pos1,pos2;
 
   lives_ogg_priv_t *priv=(lives_ogg_priv_t *)cdata->priv;
   ogg_t *opriv=priv->opriv;
 
   pos1=vstream->data_start;
   pos2=opriv->total_bytes;
-  serialno=vstream->stream_id;
+  //serialno=vstream->stream_id;
 
   start_pos = pos2 - BYTES_TO_READ;
 
@@ -2464,8 +2462,6 @@
   boolean cont=FALSE;
   int max_frame_diff;
   int64_t granulepos=0;
-  static int64_t last_cframe;
-
   int64_t ppos_lower=-1,ppos_upper=-1;
 
   static index_entry *fidx=NULL;
@@ -2592,7 +2588,6 @@
 	  priv->cframe=kframe=priv->kframe_offset;
 	}
 
-	last_cframe=priv->cframe;
 	priv->skip=tframe-priv->cframe;
 	//printf("skip is %ld - %ld = %ld\n",tframe,priv->cframe,priv->skip);
       }

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/effects/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/effects/Makefile.in Changed

@@ -132,6 +132,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -185,6 +186,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -198,6 +201,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -226,6 +230,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -272,6 +278,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -305,7 +312,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/effects/RFXscripts/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/effects/RFXscripts/Makefile.in Changed

@@ -119,6 +119,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -172,6 +173,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -185,6 +188,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -213,6 +217,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -259,6 +265,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -292,7 +299,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/encoders/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/encoders/Makefile.in Changed

@@ -119,6 +119,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -172,6 +173,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -185,6 +188,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -213,6 +217,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -259,6 +265,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -292,7 +299,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/encoders/ffmpeg_encoder -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/encoders/ffmpeg_encoder Changed

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/encoders/mencoder_encoder -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/encoders/mencoder_encoder Changed

@@ -29,7 +29,7 @@
 
 
 if ($command eq "version") {
-    print "mencoder encoder plugin v1.91\n";
+    print "mencoder encoder plugin v1.92\n";
     exit 0;
 }
 
@@ -57,7 +57,7 @@
     # bit 1 - unused
     # bit 2 - can encode png
     # bit 3 - not pure perl
-    print "4\n";
+    print "5\n";
     exit 0;
 }
 
@@ -68,8 +68,11 @@
    # return format_name|display_name|audio_types|restrictions|extension|
 
    # audio types are: 0 - cannot encode audio, 1 - can encode using
-   #  mp3, 2 - can encode using pcm, 4 - can encode using mp2, 8 - vorbis
+   #  mp3, 2 - can encode using pcm, 3 - can encode using pcm and mp3
+   # 4 - mp2, 8 - vorbis, 16 - AC3, 32 - AAC, 64 - AMR-NB, 128 - raw, 256 = wma2
 
+   print "flv|flv|1|arate=44100;22050;11025|flv|\n";
+   print "wmv2|wmv2/wma2/asf|256|arate=44100;22050;11025|wmv|\n";
    print "mjpeg|mjpg|2|none|avi|\n";
    print "ffv1|ffv1 (lossless)|2|none|avi|\n";
    print "kvcd|kvcd (experimental)|4|arate=32000;44100;48000,fps=24;25;30,aspect=352:240,hblock=16,vblock=16|mpg|\n";
@@ -77,11 +80,40 @@
    exit 0;
 }
 
+if ($command eq "get_rfx") {
+    # nice example of how to give the user a choice of options
+
+    if ($otype eq "flv") {
+	$aq=&rc_get("encoder_acodec");
+	if ($aq==0) {
+	    # mandatory section
+	    print "<define>\n";
+	    print "|1.7\n";
+	    print "</define>\n";
+	    
+	    # mandatory section
+	    print "<language_code>\n";
+	    print "0xF0\n";
+	    print "</language_code>\n";
+	    
+	    # optional section
+	    print "<params>\n";
+	    print "mp3|Use _mp3 audio codec|bool|1|1\n";
+	    print "mp3lame|Use mp3_lame audio codec|bool|0|1\n";
+	    print "</params>\n";
+
+	}
+    }
+}
+
 
 
 if ($command eq "encode") {
     # encode 
 
+    $usemp3=$ARGV[13];
+    $usemp3lame=$ARGV[14];
+
     $encoder_command="mencoder";
 
     # remove ":"'s from comments, mencoder doesn't like them even in quotes
@@ -108,7 +140,7 @@
     # set the codec
     $vcodec="mjpeg";
     
-    if ($otype eq "mpeg4" || $otype eq "mpeg2video" || $otype eq "ffv1") {
+    if ($otype eq "mpeg4" || $otype eq "mpeg2video" || $otype eq "ffv1" || $otype eq "flv" || $otype eq "wmv2") {
 	$vcodec=$otype;
     }
 
@@ -166,13 +198,38 @@
     }
     system($syscom);
 
+    #audio
     $audio_com="";
     unless ($audiofile eq "") {
-	$audio_com=" -oac copy -audiofile " . $audiofile;
+	if ($aq==0) {
+	    if ($usemp3lame) {
+		$audio_com.="-audiofile ".$audiofile." -oac lavc -lavcopts acodec=libmp3lame";
+	    }
+	    else {
+		$audio_com.="-audiofile ".$audiofile." -oac lavc -lavcopts acodec=mp3";
+	    }
+	}
+	elsif ($aq==2) {
+	    $audio_com="-audiofile ".$audiofile." -oac copy";
+	}
+	elsif ($aq==4) {
+	    $audio_com="-audiofile ".$audiofile." -oac lavc -lavcopts acodec=mp2";
+	}
+	elsif ($aq==128) {
+	    $audio_com="-audiofile ".$audiofile." -oac lavc -lavcopts acodec=wmav2";
+	}
+    }
+
+    # muxing
+    if ($otype eq "flv") {
+	$lavfopts="-of lavf -lavfopts format=flv";
+    }
+    if ($otype eq "wmv3") {
+	$lavfopts="-of lavf -lavfopts format=asf";
     }
 
-    if ($otype eq "mjpeg" || $otype eq "ffv1") {
-	$syscom=$encoder_command . " -mc 0 -o \"$nfile\" $audio_com -ovc copy -noskip -ofps $fps $tmpvid -info comment=\"$comment\":name=\"$title\":artist=\"$author\" $err";
+    if ($otype eq "mjpeg" || $otype eq "ffv1" || $otype eq "flv" || $otype eq "wmv2") {
+	$syscom=$encoder_command . " -mc 0 -o \"$nfile\" -ovc copy -noskip -ofps $fps $tmpvid $audio_com $lavfopts -info comment=\"$comment\":name=\"$title\":artist=\"$author\" $err";
     }
     elsif ($otype eq "kvcd") {
 	$abitrate=112;
@@ -180,7 +237,7 @@
 	$inter_matrix="16,18,20,22,24,26,28,30,18,20,22,24,26,28,30,32,20,22,24,26,28,30,32,34,22,24,26,30,32,32,34,36,24,26,28,32,34,34,36,38,26,28,30,32,34,36,38,40,28,30,32,34,36,38,42,42,30,32,34,36,38,40,42,44";
 	$scale="scale=352:240";
 
-	$syscom="$encoder_command $tmpvid -mc 0 -of mpeg -ovc lavc -oac lavc -lavcopts acodec=mp2:abitrate=$abitrate:vcodec=mpeg1video:keyint=".int($fps).":mbd=1:vrc_minrate=64:vrc_maxrate=3000:vrc_buf_size=320:aspect=4/3:intra_matrix=$matrix:inter_matrix=$inter_matrix -vf $scale -o \"$nfile\"";
+	$syscom="$encoder_command $tmpvid -mc 0 -of mpeg -ovc lavc $audio_com:abitrate=$abitrate:vcodec=mpeg1video:keyint=".int($fps).":mbd=1:vrc_minrate=64:vrc_maxrate=3000:vrc_buf_size=320:aspect=4/3:intra_matrix=$matrix:inter_matrix=$inter_matrix -vf $scale -o \"$nfile\"";
 
     }
     if (defined($DEBUG_ENCODERS)) {

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/playback/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/Makefile.in Changed

@@ -132,6 +132,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -185,6 +186,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = 
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -198,6 +201,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -226,6 +230,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -272,6 +278,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -305,7 +312,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/playback/audiostream/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/audiostream/Makefile.in Changed

@@ -119,6 +119,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -172,6 +173,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -185,6 +188,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -213,6 +217,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -259,6 +265,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -292,7 +299,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/playback/audiostream/audiostreamer.pl -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/audiostream/audiostreamer.pl Changed

@@ -12,14 +12,35 @@
 
 
 if ($command eq "get_formats") {
-    # list of formats separated by |
+    # list of formats we can handle, separated by |
     # see lives/src/plugins.h for values
+
+    # unlike encoders, this is sent as a string e.g. "1|3|8"
+
     print "3";
     exit 0;
 }
 
 
 
+if ($command eq "check") {
+    my $chkform=$ARGV[1];
+    if ($chkform == 3) {
+	#vorbis
+
+	if (&location("oggenc") eq "" && &location("sox") eq "") {
+
+	    print "\nFor audio encoding to the 'vorbis' format you need to have either\n'oggenc' or correctly configured 'sox' installed.\nPlease install either of these programs and try again.\n";
+	    exit 1;
+	}
+	exit 0;
+    }
+}
+
+
+
+
+
 if ($command eq "play") {
     my $result;
     
@@ -31,16 +52,14 @@
     # TODO - channels, samps, signed, endian
 
     #system("mkfifo $outfifo");
-
-
     #create outfifo; host should have already created infifo
 
     # do conversion
     # audio formats taken from lives/src/plugins.h
     if ($format==3) {
 	#vorbis
-	unless (`which oggenc 2>/dev/null` eq "") { 
-	    system("oggenc -r --ignorelength -R $arate -B 16 -C 2 -o $outfifo $infifo");
+	unless (`which oggenc 2>/dev/null` eq "") {
+	    system("oggenc -r --ignorelength -R $arate -B 16 -C 2 -m 32 -M 256 -o $outfifo $infifo");
 	}
 	else {
 	    system("sox -t raw -r $arate -s -L -b 16 -c 2 $infifo -t vorbis $outfifo");
@@ -59,3 +78,15 @@
     unlink $outfifo;
 
 }
+
+
+
+########################################33333333
+
+sub location {
+    # return the location of an executable
+    my ($command)=shift;
+    my ($location)=`which $command 2>/dev/null`;
+    chomp($location);
+    $location;
+}

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/playback/video/Makefile.am -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/Makefile.am Changed

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/playback/video/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/Makefile.in Changed

@@ -95,6 +95,15 @@
 @FORCE_SDL_TRUE@@HAVE_SDL_FALSE@am_SDL_la_rpath = -rpath \
 @FORCE_SDL_TRUE@@HAVE_SDL_FALSE@	$(videopluginslibdir)
 @HAVE_SDL_TRUE@am_SDL_la_rpath = -rpath $(videopluginslibdir)
+icecast_output_la_LIBADD =
+icecast_output_la_SOURCES = icecast_output.c
+icecast_output_la_OBJECTS = icecast_output_la-icecast_output.lo
+icecast_output_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(icecast_output_la_CFLAGS) $(CFLAGS) \
+	$(icecast_output_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_MJPEGTOOLS_TRUE@am_icecast_output_la_rpath = -rpath \
+@HAVE_MJPEGTOOLS_TRUE@	$(videopluginslibdir)
 lives2lives_stream_la_LIBADD =
 lives2lives_stream_la_SOURCES = lives2lives_stream.c
 lives2lives_stream_la_OBJECTS =  \
@@ -149,10 +158,10 @@
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = SDL.c lives2lives_stream.c oggstream.c vjack_output.c \
-	vloopback.c yuv4mpeg_stream.c
-DIST_SOURCES = SDL.c lives2lives_stream.c oggstream.c vjack_output.c \
-	vloopback.c yuv4mpeg_stream.c
+SOURCES = SDL.c icecast_output.c lives2lives_stream.c oggstream.c \
+	vjack_output.c vloopback.c yuv4mpeg_stream.c
+DIST_SOURCES = SDL.c icecast_output.c lives2lives_stream.c oggstream.c \
+	vjack_output.c vloopback.c yuv4mpeg_stream.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -183,6 +192,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -236,6 +246,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = 
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -249,6 +261,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -277,6 +290,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -323,6 +338,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -356,7 +372,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -391,6 +406,7 @@
 @HAVE_SDL_TRUE@LDFLAGS_SDL = @SDL_LIBS@
 @HAVE_MJPEGTOOLS_TRUE@YUV4MPEG_libs = yuv4mpeg_stream.la
 @HAVE_MJPEGTOOLS_TRUE@oggstream_libs = oggstream.la
+@HAVE_MJPEGTOOLS_TRUE@icecast_output_libs = icecast_output.la
 @ENABLE_VJACK_TRUE@vjack_output_libs = vjack_output.la
 @ENABLE_VJACK_TRUE@vjack_output_la_CFLAGS = $(shared_cflags) $(weed_cflags)
 @ENABLE_VJACK_TRUE@vjack_output_la_LDFLAGS = $(shared_ldflags) -ljack
@@ -400,12 +416,14 @@
 yuv4mpeg_stream_la_LDFLAGS = $(shared_ldflags) @MJPEGTOOLS_LIBS@
 oggstream_la_CFLAGS = @MJPEGTOOLS_CFLAGS@ $(shared_cflags) $(weed_cflags)
 oggstream_la_LDFLAGS = $(shared_ldflags) @MJPEGTOOLS_LIBS@
+icecast_output_la_CFLAGS = @MJPEGTOOLS_CFLAGS@ $(shared_cflags) $(weed_cflags)
+icecast_output_la_LDFLAGS = $(shared_ldflags) @MJPEGTOOLS_LIBS@
 SDL_la_CFLAGS = $(shared_cflags) $(CFLAGS_SDL) $(weed_cflags)
 SDL_la_LDFLAGS = $(shared_ldflags) $(LDFLAGS_SDL)
 @HAVE_LIBv4l1_TRUE@@IS_LINUX_GNU_TRUE@vloopback_libs = vloopback.la
 @HAVE_LIBv4l1_TRUE@@IS_LINUX_GNU_TRUE@vloopback_la_CFLAGS = $(shared_cflags) $(weed_cflags) -Dv4l1_INCFILE=@v4l1_INCFILE@
 @HAVE_LIBv4l1_TRUE@@IS_LINUX_GNU_TRUE@vloopback_la_LDFLAGS = $(shared_ldflags)
-videopluginslib_LTLIBRARIES = $(SDL_libs) $(YUV4MPEG_libs) $(oggstream_libs) $(vjack_output_libs) lives2lives_stream.la $(vloopback_libs)
+videopluginslib_LTLIBRARIES = $(SDL_libs) $(YUV4MPEG_libs) $(oggstream_libs) $(icecast_output_libs) $(vjack_output_libs) lives2lives_stream.la $(vloopback_libs)
 EXTRA_DIST = videoplugin.h
 all: all-am
 
@@ -474,6 +492,8 @@
 	done
 SDL.la: $(SDL_la_OBJECTS) $(SDL_la_DEPENDENCIES) 
 	$(SDL_la_LINK) $(am_SDL_la_rpath) $(SDL_la_OBJECTS) $(SDL_la_LIBADD) $(LIBS)
+icecast_output.la: $(icecast_output_la_OBJECTS) $(icecast_output_la_DEPENDENCIES) 
+	$(icecast_output_la_LINK) $(am_icecast_output_la_rpath) $(icecast_output_la_OBJECTS) $(icecast_output_la_LIBADD) $(LIBS)
 lives2lives_stream.la: $(lives2lives_stream_la_OBJECTS) $(lives2lives_stream_la_DEPENDENCIES) 
 	$(lives2lives_stream_la_LINK) -rpath $(videopluginslibdir) $(lives2lives_stream_la_OBJECTS) $(lives2lives_stream_la_LIBADD) $(LIBS)
 oggstream.la: $(oggstream_la_OBJECTS) $(oggstream_la_DEPENDENCIES) 
@@ -492,6 +512,7 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SDL_la-SDL.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icecast_output_la-icecast_output.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lives2lives_stream_la-lives2lives_stream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oggstream_la-oggstream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vjack_output_la-vjack_output.Plo@am__quote@
@@ -526,6 +547,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SDL_la_CFLAGS) $(CFLAGS) -c -o SDL_la-SDL.lo `test -f 'SDL.c' || echo '$(srcdir)/'`SDL.c
 
+icecast_output_la-icecast_output.lo: icecast_output.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(icecast_output_la_CFLAGS) $(CFLAGS) -MT icecast_output_la-icecast_output.lo -MD -MP -MF $(DEPDIR)/icecast_output_la-icecast_output.Tpo -c -o icecast_output_la-icecast_output.lo `test -f 'icecast_output.c' || echo '$(srcdir)/'`icecast_output.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/icecast_output_la-icecast_output.Tpo $(DEPDIR)/icecast_output_la-icecast_output.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='icecast_output.c' object='icecast_output_la-icecast_output.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(icecast_output_la_CFLAGS) $(CFLAGS) -c -o icecast_output_la-icecast_output.lo `test -f 'icecast_output.c' || echo '$(srcdir)/'`icecast_output.c
+
 lives2lives_stream_la-lives2lives_stream.lo: lives2lives_stream.c
 @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lives2lives_stream_la_CFLAGS) $(CFLAGS) -MT lives2lives_stream_la-lives2lives_stream.lo -MD -MP -MF $(DEPDIR)/lives2lives_stream_la-lives2lives_stream.Tpo -c -o lives2lives_stream_la-lives2lives_stream.lo `test -f 'lives2lives_stream.c' || echo '$(srcdir)/'`lives2lives_stream.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/lives2lives_stream_la-lives2lives_stream.Tpo $(DEPDIR)/lives2lives_stream_la-lives2lives_stream.Plo

LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/icecast_output.c Added

@@ -0,0 +1,516 @@
+// LiVES - ogg/theora/vorbis to icecast stream engine
+// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl>
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+#include "videoplugin.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+static int mypalette=WEED_PALETTE_END;
+static int palette_list[2];
+
+static int clampings[3];
+static int myclamp;
+
+static char plugin_version[64]="LiVES ogg/theora/vorbis stream engine version 1.0";
+
+static boolean (*render_fn)(int hsize, int vsize, void **pixel_data, void **return_data);
+boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data, void **return_data);
+boolean render_frame_unknown (int hsize, int vsize, void **pixel_data, void **return_data);
+
+static int ov_vsize,ov_hsize;
+
+static char *tmpdir;
+
+static char xfile[4096];
+
+static int aforms[2];
+
+/////////////////////////////////////////////////////////////////////////
+
+// yuv4mpeg specific stuff
+
+#include <yuv4mpeg.h>
+
+typedef struct {
+  y4m_stream_info_t streaminfo;
+  y4m_frame_info_t frameinfo;
+  y4m_ratio_t sar;
+  y4m_ratio_t dar;
+  int fd;
+  int hsize;
+  int vsize;
+  y4m_ratio_t fps;
+  int bufn;
+  int bufc;
+  uint8_t ***framebuf;
+} yuv4m_t;
+
+
+static yuv4m_t *yuv4mpeg;
+
+yuv4m_t *yuv4mpeg_alloc (void) {
+  yuv4m_t *yuv4mpeg = (yuv4m_t *) malloc (sizeof(yuv4m_t));
+  if(!yuv4mpeg) return NULL;
+  yuv4mpeg->sar = y4m_sar_UNKNOWN;
+  //yuv4mpeg->dar = y4m_dar_4_3;
+  return yuv4mpeg;
+}
+
+
+
+static void make_path(const char *fname, int pid, const char *ext) {
+  snprintf(xfile,4096,"%s/%s-%d.%s",tmpdir,fname,pid,ext);
+}
+
+static uint8_t **blankframe;
+
+
+
+
+static uint8_t **make_blankframe(size_t size, boolean clear) {
+  uint8_t **planes;
+
+  planes=(uint8_t **)malloc(3*sizeof(uint8_t *));
+
+  if (!planes) return NULL;
+
+  planes[0]=(uint8_t *)malloc(size);
+
+  if (!planes[0]) {
+    free(planes);
+    return NULL;
+  }
+
+  if (clear) {
+    if (myclamp==WEED_YUV_CLAMPING_CLAMPED) memset(planes[0],16,size);
+    else memset(planes[0],1,size);
+  }
+
+  size>>=2;
+
+  planes[1]=(uint8_t *)malloc(size);
+  if (!planes[1]) {
+    free(planes[0]);
+    free(planes);
+    return NULL;
+  }
+
+  // yes i know....129....well some encoders may ignore "black frames" @ start
+  if (clear) memset (planes[1],129,size);
+
+  planes[2]=(uint8_t *)malloc(size);
+  if (!planes[2]) {
+    free(planes[1]);
+    free(planes[0]);
+    free(planes);
+    return NULL;
+  }
+  if (clear) memset (planes[2],128,size);
+
+  return planes;
+}
+
+
+
+
+//////////////////////////////////////////////
+
+
+const char *module_check_init(void) {
+  int rfd;
+  char buf[16384];
+  int dummyvar;
+
+  ssize_t ret;
+  // check all binaries are present
+
+
+  render_fn=&render_frame_unknown;
+  ov_vsize=ov_hsize=0;
+
+  yuv4mpeg=yuv4mpeg_alloc();
+  y4m_init_stream_info (&(yuv4mpeg->streaminfo));
+  y4m_init_frame_info (&(yuv4mpeg->frameinfo));
+  yuv4mpeg->fd=-1;
+
+  // get tempdir
+  dummyvar=system("smogrify get_tempdir oggstream");
+  rfd=open("/tmp/.smogrify.oggstream",O_RDONLY);
+  ret=read(rfd,(void *)buf,16384);
+  memset(buf+ret,0,1);
+
+  tmpdir=strdup(buf);
+
+  blankframe=NULL;
+
+  dummyvar=dummyvar; // keep compiler happy
+
+  return NULL;
+}
+
+
+const char *version (void) {
+  return plugin_version;
+}
+
+const char *get_description (void) {
+  return "The icecast_output plugin provides realtime encoding\n to an icecast2 server in ogg/theora/vorbis format.\nIt requires ffmpeg2theora, oggTranscode, oggfwd and oggJoin.\nTry first with small frame sizes and low fps.\nNB: oggTranscode can be downloaded as part of oggvideotools 0.8a\nhttp://sourceforge.net/projects/oggvideotools/files/\n";
+}
+
+const int *get_palette_list(void) {
+  palette_list[0]=WEED_PALETTE_YUV420P;
+  palette_list[1]=WEED_PALETTE_END;
+  return palette_list;
+}
+
+
+uint64_t get_capabilities (int palette) {
+  return 0;
+}
+
+
+const int *get_audio_fmts() {
+  // this is not yet documented in the manual, but is an optional function to get a list of audio formats. If the user chooses to stream audio then it will be sent to a fifo file in the tempdir called livesaudio.stream, in one of the supported formats
+  aforms[0]=3; // vorbis - see src/plugins.h
+  aforms[1]=-1; // end
+
+  return aforms;
+}
+
+
+const char *get_rfx (void) {
+  return \
+"<define>\\n\
+|1.7\\n\
+</define>\\n\
+<language_code>\\n\
+0xF0\\n\
+</language_code>\\n\
+<params> \\n\
+syncd|A/V Sync _delay (seconds)|num2|4.|0.|20.|\\n\
+address|Icecast server _address|string|127.0.0.1|16|\\n\

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/playback/video/oggstream.c -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/oggstream.c Changed

@@ -7,6 +7,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -16,6 +17,7 @@
 static int palette_list[2];
 
 static int clampings[3];
+static int myclamp;
 
 static char plugin_version[64]="LiVES ogg/theora/vorbis stream engine version 1.0";
 
@@ -46,6 +48,9 @@
   int hsize;
   int vsize;
   y4m_ratio_t fps;
+  int bufn;
+  int bufc;
+  uint8_t ***framebuf;
 } yuv4m_t;
 
 
@@ -65,6 +70,54 @@
   snprintf(xfile,4096,"%s/%s-%d.%s",tmpdir,fname,pid,ext);
 }
 
+static uint8_t **blankframe;
+
+
+
+
+static uint8_t **make_blankframe(size_t size, boolean clear) {
+  uint8_t **planes;
+
+  planes=(uint8_t **)malloc(3*sizeof(uint8_t *));
+
+  if (!planes) return NULL;
+
+  planes[0]=(uint8_t *)malloc(size);
+
+  if (!planes[0]) {
+    free(planes);
+    return NULL;
+  }
+
+  if (clear) {
+    if (myclamp==WEED_YUV_CLAMPING_CLAMPED) memset(planes[0],16,size);
+    else memset(planes[0],1,size);
+  }
+
+  size>>=2;
+
+  planes[1]=(uint8_t *)malloc(size);
+  if (!planes[1]) {
+    free(planes[0]);
+    free(planes);
+    return NULL;
+  }
+
+  if (clear) memset (planes[1],129,size);
+
+  planes[2]=(uint8_t *)malloc(size);
+  if (!planes[2]) {
+    free(planes[1]);
+    free(planes[0]);
+    free(planes);
+    return NULL;
+  }
+  if (clear) memset (planes[2],128,size);
+
+  return planes;
+}
+
+
 
 
 //////////////////////////////////////////////
@@ -95,6 +148,10 @@
 
   tmpdir=strdup(buf);
 
+  blankframe=NULL;
+
+  dummyvar=dummyvar; // keep compiler happy
+
   return NULL;
 }
 
@@ -138,6 +195,7 @@
 </language_code>\\n\
 <params> \\n\
 output|Output _file|string|/tmp/output.ogv|1024|\\n\
+syncd|A/V Sync _delay (seconds)|num2|0.|0.|20.|\\n\
 </params> \\n\
 <param_window> \\n\
 </param_window> \\n\
@@ -157,6 +215,14 @@
 }
 
 
+
+boolean set_yuv_palette_clamping(int clamping_type) {
+  myclamp=clamping_type;
+  return TRUE;
+}
+
+
+
 boolean set_palette (int palette) {
   if (!yuv4mpeg) return FALSE;
   if (palette==WEED_PALETTE_YUV420P) {
@@ -169,7 +235,7 @@
 }
 
 const char * get_fps_list (int palette) {
-  return "12|16|20|24|24000:1001|25|30000:1001|30|60";
+  return "12|16|8|4|2|1|20|24|24000:1001|25|30000:1001|30|60";
 }
 
 
@@ -178,7 +244,7 @@
     yuv4mpeg->fps=y4m_fps_NTSC_FILM;
     return TRUE;
   }
-  if (in_fps>=23.97&&in_fps<23.9701) {
+  if (in_fps>=29.97&&in_fps<29.9701) {
     yuv4mpeg->fps=y4m_fps_NTSC;
     return TRUE;
   }
@@ -195,9 +261,12 @@
   const char *outfile;
   char cmd[8192];
   int afd;
+  int i;
 
   int mypid=getpid();
 
+  double syncd=0;
+
   if (mypalette==WEED_PALETTE_END) {
     fprintf(stderr,"oggstream plugin error: No palette was set !\n");
     return FALSE;
@@ -210,6 +279,10 @@
     outfile="-";
   }
 
+  if (argc>1) {
+    syncd=strtod(argv[1],NULL);
+  }
+
   make_path("video",mypid,"ogv");
   unlink(xfile);
   make_path("video2",mypid,"ogv");
@@ -217,16 +290,26 @@
   make_path("stream",mypid,"fifo");
   unlink(xfile);
 
+  yuv4mpeg->bufn=(int)(syncd*yuv4mpeg->fps.n+.5);
+  if (syncd==0) yuv4mpeg->bufn=0;
+  if (yuv4mpeg->bufn>0) {
+    yuv4mpeg->bufc=1;
+    yuv4mpeg->framebuf=(uint8_t ***)malloc(yuv4mpeg->bufn*sizeof(uint8_t **));
+    if (!yuv4mpeg->framebuf) return FALSE;
+    for (i=0;i<yuv4mpeg->bufn;i++) yuv4mpeg->framebuf[i]=NULL;
+  }
+  else yuv4mpeg->bufc=0;
+
   make_path("stream",mypid,"fifo");
   mkfifo(xfile,S_IRUSR|S_IWUSR); // raw yuv4m
   make_path("video",mypid,"ogv");
   mkfifo(xfile,S_IRUSR|S_IWUSR); // raw ogg stream
   make_path("video2",mypid,"ogv");
-  mkfifo(xfile,S_IRUSR|S_IWUSR); // corrected ogg stream
+  mkfifo(xfile,S_IRUSR|S_IWUSR); // corrected ogg stream (saved or muxed)
 
-  snprintf(cmd,8192,"ffmpeg2theora -f yuv4m -o %s/video-%d.ogv %s/stream-%d.fifo 2>/dev/null&",tmpdir,mypid,tmpdir,mypid);
+  snprintf(cmd,8192,"ffmpeg2theora --noaudio --nosync -e 10000 -f yuv4m -F %d:%d -o %s/video-%d.ogv %s/stream-%d.fifo&",(int)yuv4mpeg->fps.n,(int)yuv4mpeg->fps.d,tmpdir,mypid,tmpdir,mypid);
   dummyvar=system(cmd);
-
+  //printf("cmd is %s\n",cmd);
   make_path("livesaudio",mypid,"stream");
 
   afd=open(xfile,O_RDONLY|O_NONBLOCK);
@@ -246,17 +329,22 @@
     snprintf(cmd,8192,"oggTranscode %s/video-%d.ogv \"%s\" &",tmpdir,mypid,outfile); 
     dummyvar=system(cmd);
   }
-  // open fifo for writing
+
+  // open first fifo for writing
 
   make_path("stream",mypid,"fifo");
-  yuv4mpeg->fd=open(xfile,O_WRONLY);
-  dup2(yuv4mpeg->fd,1);
-  close(yuv4mpeg->fd);
+  yuv4mpeg->fd=open(xfile,O_WRONLY|O_SYNC|O_CREAT,S_IWUSR|S_IRUSR);

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/playback/video/videoplugin.h -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/videoplugin.h Changed

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/playback/video/vloopback.c -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/vloopback.c Changed

LiVES-1.4.7.tar.bz2/lives-plugins/plugins/playback/video/yuv4mpeg_stream.c -> LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/yuv4mpeg_stream.c Changed

LiVES-1.4.7.tar.bz2/lives-plugins/themes/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/themes/Makefile.in Changed

@@ -156,6 +156,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -209,6 +210,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -222,6 +225,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -250,6 +254,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -296,6 +302,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -329,7 +336,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/themes/camera/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/themes/camera/Makefile.in Changed

@@ -116,6 +116,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -169,6 +170,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -182,6 +185,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -210,6 +214,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -256,6 +262,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -289,7 +296,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/themes/crayons-bright/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/themes/crayons-bright/Makefile.in Changed

@@ -116,6 +116,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -169,6 +170,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -182,6 +185,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -210,6 +214,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -256,6 +262,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -289,7 +296,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/themes/crayons/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/themes/crayons/Makefile.in Changed

@@ -116,6 +116,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -169,6 +170,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -182,6 +185,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -210,6 +214,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -256,6 +262,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -289,7 +296,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/themes/cutting_room/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/themes/cutting_room/Makefile.in Changed

@@ -116,6 +116,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -169,6 +170,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -182,6 +185,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -210,6 +214,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -256,6 +262,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -289,7 +296,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/themes/editor/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/themes/editor/Makefile.in Changed

@@ -116,6 +116,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -169,6 +170,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -182,6 +185,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -210,6 +214,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -256,6 +262,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -289,7 +296,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/themes/pinks/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/themes/pinks/Makefile.in Changed

@@ -116,6 +116,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -169,6 +170,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -182,6 +185,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -210,6 +214,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -256,6 +262,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -289,7 +296,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/weed-plugins/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/Makefile.in Changed

@@ -311,6 +311,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -364,6 +365,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = 
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -377,6 +380,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -405,6 +409,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -451,6 +457,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -484,7 +491,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/weed-plugins/alien_overlay.c -> LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/alien_overlay.c Changed

@@ -96,7 +96,7 @@
   old_pixel_data=sdata->old_pixel_data;
 
   // new threading arch
-  /*  if (weed_plant_has_leaf(out_channel,"offset")) {
+  if (weed_plant_has_leaf(out_channel,"offset")) {
     int offset=weed_get_int_value(out_channel,"offset",&error);
     int dheight=weed_get_int_value(out_channel,"height",&error);
 
@@ -104,7 +104,7 @@
     dst+=offset*orowstride;
     end=src+dheight*irowstride;
     old_pixel_data+=width*offset;
-    }*/
+  }
 
   for (;src<end;src+=irowstride) {
     for (j=0;j<width;j++) {
@@ -138,7 +138,7 @@
     weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,palette_list),NULL};
     weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE,palette_list),NULL};
     
-    weed_plant_t *filter_class=weed_filter_class_init("alien overlay","salsaman",1,0,&alien_over_init,&alien_over_process,&alien_over_deinit,in_chantmpls,out_chantmpls,NULL,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("alien overlay","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,&alien_over_init,&alien_over_process,&alien_over_deinit,in_chantmpls,out_chantmpls,NULL,NULL);
     
     weed_plugin_info_add_filter_class (plugin_info,filter_class);

LiVES-1.4.7.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.in -> LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.in Changed

@@ -160,6 +160,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -213,6 +214,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = 
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -226,6 +229,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -254,6 +258,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -300,6 +306,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -333,7 +340,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/lives-plugins/weed-plugins/gdk/puretext.c -> LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/gdk/puretext.c Changed

LiVES-1.4.7.tar.bz2/lives-plugins/weed-plugins/gdk/scribbler.c -> LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/gdk/scribbler.c Changed

LiVES-1.4.7.tar.bz2/lives-plugins/weed-plugins/layout_blends.c -> LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/layout_blends.c Changed

@@ -97,6 +97,18 @@
       xstart=xend=-bw;
     }
 
+    // new threading arch
+    if (weed_plant_has_leaf(out_channel,"offset")) {
+      int offset=weed_get_int_value(out_channel,"offset",&error);
+      int dheight=weed_get_int_value(out_channel,"height",&error);
+      
+      src1+=offset*irowstride1;
+      end=src1+dheight*irowstride1;
+      
+      src2+=offset*irowstride2;
+      
+      dst+=offset*orowstride;
+    }
 
     for (;src1<end;src1+=irowstride1) {
       for (j=0;j<width;j+=3) {
@@ -139,7 +151,7 @@
 
     weed_plant_t *in_params1[]={weed_float_init("start","_Start",0.666667,0.,1.),weed_radio_init("sym","Make s_ymmetrical",1,1),weed_radio_init("usend","Use _end value",0,1),weed_float_init("end","_End",0.333333,0.,1.),weed_switch_init("vert","Split _horizontally",0),weed_float_init("borderw","Border _width",0.,0.,0.5),weed_colRGBi_init("borderc","Border _colour",0,0,0),NULL};
 
-    weed_plant_t *filter_class=weed_filter_class_init("triple split","salsaman",1,0,NULL,&tsplit_process,NULL,in_chantmpls,out_chantmpls,in_params1,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("triple split","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&tsplit_process,NULL,in_chantmpls,out_chantmpls,in_params1,NULL);
 
     weed_plant_t *gui=weed_filter_class_get_gui(filter_class);
     char *rfx_strings[]={"layout|p0|","layout|p1|","layout|p2|p3|","layout|p4|","layout|hseparator|"};

LiVES-1.4.7.tar.bz2/lives-plugins/weed-plugins/multi_transitions.c -> LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/multi_transitions.c Changed

@@ -159,6 +159,21 @@
     yy=(int)(hwidth/(float)psize*bf+.5)*psize;
   }
 
+  // new threading arch
+  if (weed_plant_has_leaf(out_channel,"offset")) {
+    int offset=weed_get_int_value(out_channel,"offset",&error);
+    int dheight=weed_get_int_value(out_channel,"height",&error);
+
+    src1+=offset*irowstride1;
+    end=src1+dheight*irowstride1;
+
+    src2+=offset*irowstride2;
+
+    dst+=offset*orowstride;
+
+    i+=offset;
+  }
+
   for (;src1<end;src1+=irowstride1) {
     for (j=0;j<width;j+=psize) {
       switch (type) {
@@ -252,13 +267,13 @@
     weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE,palette_list),NULL};
     weed_plant_t *in_params1[]={weed_float_init("amount","_Transition",0.,0.,1.),NULL};
 
-    weed_plant_t *filter_class=weed_filter_class_init("iris rectangle","salsaman",1,WEED_FILTER_HINT_IS_STATELESS,NULL,irisr_process,NULL,in_chantmpls,out_chantmpls,in_params1,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("iris rectangle","salsaman",1,WEED_FILTER_HINT_IS_STATELESS|WEED_FILTER_HINT_MAY_THREAD,NULL,irisr_process,NULL,in_chantmpls,out_chantmpls,in_params1,NULL);
 
     weed_set_boolean_value(in_params1[0],"transition",WEED_TRUE);
 
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
 
-    filter_class=weed_filter_class_init("iris circle","salsaman",1,WEED_FILTER_HINT_IS_STATELESS,NULL,irisc_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params1)),NULL);
+    filter_class=weed_filter_class_init("iris circle","salsaman",1,WEED_FILTER_HINT_IS_STATELESS|WEED_FILTER_HINT_MAY_THREAD,NULL,irisc_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params1)),NULL);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
     weed_free(clone1);
     weed_free(clone2);
@@ -267,7 +282,7 @@
 
     weed_set_int_value(out_chantmpls[0],"flags",0);
 
-    filter_class=weed_filter_class_init("4 way split","salsaman",1,WEED_FILTER_HINT_IS_STATELESS,NULL,fourw_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params1)),NULL);
+    filter_class=weed_filter_class_init("4 way split","salsaman",1,WEED_FILTER_HINT_IS_STATELESS|WEED_FILTER_HINT_MAY_THREAD,NULL,fourw_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params1)),NULL);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
     weed_free(clone1);
     weed_free(clone2);
@@ -276,7 +291,7 @@
 
     weed_set_int_value(out_chantmpls[0],"flags",WEED_CHANNEL_CAN_DO_INPLACE|WEED_CHANNEL_REINIT_ON_SIZE_CHANGE);
     
-    filter_class=weed_filter_class_init("dissolve","salsaman",1,WEED_FILTER_HINT_IS_STATELESS,dissolve_init,dissolve_process,dissolve_deinit,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params1)),NULL);
+    filter_class=weed_filter_class_init("dissolve","salsaman",1,WEED_FILTER_HINT_IS_STATELESS|WEED_FILTER_HINT_MAY_THREAD,dissolve_init,dissolve_process,dissolve_deinit,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params1)),NULL);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
     weed_free(clone1);
     weed_free(clone2);

LiVES-1.4.7.tar.bz2/lives-plugins/weed-plugins/rippleTV.c -> LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/rippleTV.c Changed

LiVES-1.4.7.tar.bz2/lives-plugins/weed-plugins/softlight.c -> LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/softlight.c Changed

LiVES-1.4.7.tar.bz2/lives-plugins/weed-plugins/targeted_zoom.c -> LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/targeted_zoom.c Changed

LiVES-1.4.7.tar.bz2/ltmain.sh -> LiVES-1.4.8.tar.bz2/ltmain.sh Changed

@@ -1,9 +1,9 @@
-# Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6b
+# libtool (GNU libtool) 2.4
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010 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.
 
@@ -32,50 +32,56 @@
 #
 # Provide generalized library-building support services.
 #
-#     --config             show all configuration variables
-#     --debug              enable verbose shell tracing
-# -n, --dry-run            display commands without modifying any files
-#     --features           display basic configuration information and exit
-#     --mode=MODE          use operation mode MODE
-#     --preserve-dup-deps  don't remove duplicate dependency libraries
-#     --quiet, --silent    don't print informational messages
-#     --tag=TAG            use configuration variables from tag TAG
-# -v, --verbose            print informational messages (default)
-#     --version            print version information
-# -h, --help               print short or long help message
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
 #
 # MODE must be one of the following:
 #
-#       clean              remove files from the build directory
-#       compile            compile a source file into a libtool object
-#       execute            automatically set library path, then run a program
-#       finish             complete the installation of libtool libraries
-#       install            install libraries or executables
-#       link               create a library or an executable
-#       uninstall          remove libraries from an installed directory
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
 #
-# MODE-ARGS vary depending on the MODE.
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
 # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
 #
 # When reporting a bug, please describe a test case to reproduce it and
 # include the following information:
 #
-#       host-triplet:	$host
-#       shell:		$SHELL
-#       compiler:		$LTCC
-#       compiler flags:		$LTCFLAGS
-#       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
-#       automake:		$automake_version
-#       autoconf:		$autoconf_version
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
 #
 # Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
-PROGRAM=ltmain.sh
+PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
+VERSION=2.4
 TIMESTAMP=""
-package_revision=1.3017
+package_revision=1.3293
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +97,15 @@
 BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
 # NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
 lt_user_locale=
 lt_safe_locale=
 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -107,15 +118,24 @@
 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
 	fi"
 done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
 
 $lt_unset CDPATH
 
 
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
 
 
 
 : ${CP="cp -f"}
-: ${ECHO="echo"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
 : ${EGREP="/bin/grep -E"}
 : ${FGREP="/bin/grep -F"}
 : ${GREP="/bin/grep"}
@@ -144,6 +164,27 @@
 dirname="s,/[^/]*$,,"
 basename="s,^.*/,,"
 
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
 # func_dirname_and_basename file append nondir_replacement
 # perform func_basename and func_dirname in a single function
 # call:
@@ -158,33 +199,183 @@
 # those functions but instead duplicate the functionality here.
 func_dirname_and_basename ()
 {
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading

LiVES-1.4.7.tar.bz2/m4/Makefile.in -> LiVES-1.4.8.tar.bz2/m4/Makefile.in Changed

@@ -92,6 +92,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -145,6 +146,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -158,6 +161,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -186,6 +190,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -232,6 +238,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -265,7 +272,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/m4/libtool.m4 -> LiVES-1.4.8.tar.bz2/m4/libtool.m4 Changed

@@ -1,7 +1,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+#                 Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -10,7 +11,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+#                 Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -37,7 +39,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ])
 
-# serial 56 LT_INIT
+# serial 57 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -66,6 +68,7 @@
 # ------------------
 AC_DEFUN([LT_INIT],
 [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
 AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -82,6 +85,8 @@
 AC_REQUIRE([LTOBSOLETE_VERSION])dnl
 m4_require([_LT_PROG_LTMAIN])dnl
 
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
 dnl Parse OPTIONS
 _LT_SET_OPTIONS([$0], [$1])
 
@@ -118,7 +123,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 ])
 
 
@@ -138,6 +143,9 @@
 m4_defun([_LT_SETUP],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -160,10 +168,13 @@
 dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 m4_require([_LT_CMD_RELOAD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
 
 _LT_CONFIG_LIBTOOL_INIT([
 # See if we are running on zsh, and set the options which allow our
@@ -179,7 +190,6 @@
 _LT_CHECK_OBJDIR
 
 m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
@@ -193,23 +203,6 @@
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/$[["`$\\]]$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$[["`\\]]$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -250,6 +243,28 @@
 ])# _LT_SETUP
 
 
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/$[["`$\\]]$/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/$[["`\\]]$/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
 # _LT_PROG_LTMAIN
 # ---------------
 # Note that this code is called both from `configure', and `config.status'
@@ -408,7 +423,7 @@
 # declaration there will have the same value as in `configure'.  VARNAME
 # must have a single quote delimited value for this to work.
 m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
 
 
 # _LT_CONFIG_STATUS_DECLARATIONS
@@ -418,7 +433,7 @@
 # embedded single quotes properly.  In configure, this macro expands
 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 #
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
 m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
 [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
     [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -517,12 +532,20 @@
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -533,9 +556,9 @@
 # Double-quote double-evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -543,16 +566,38 @@
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "

LiVES-1.4.7.tar.bz2/m4/ltoptions.m4 -> LiVES-1.4.8.tar.bz2/m4/ltoptions.m4 Changed

@@ -1,13 +1,14 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 6 ltoptions.m4
+# serial 7 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -125,7 +126,7 @@
 [enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -133,13 +134,13 @@
 esac
 
 test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
 ])# win32-dll
 
 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],

LiVES-1.4.7.tar.bz2/m4/ltversion.m4 -> LiVES-1.4.8.tar.bz2/m4/ltversion.m4 Changed

LiVES-1.4.7.tar.bz2/m4/lt~obsolete.m4 -> LiVES-1.4.8.tar.bz2/m4/lt~obsolete.m4 Changed

@@ -1,13 +1,13 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 4 lt~obsolete.m4
+# serial 5 lt~obsolete.m4
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
@@ -77,7 +77,6 @@
 m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
 m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
 m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
 m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
 m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -90,3 +89,10 @@
 m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])

LiVES-1.4.7.tar.bz2/po/ar.po -> LiVES-1.4.8.tar.bz2/po/ar.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 11:57+0000\n"
 "Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +42,7 @@
 "group_id=64341&atid=507139\n"
 "سيتم إنعاش البرنامج بعد إعادة تشغيله. وشكرا\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -54,7 +54,7 @@
 "عند الإبلاغ عن العثرات ، يرجى ذِكر نظام التشغيل الخاص بك ، والتوزيعة ، "
 "وإصدارة البرنامج."
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "وأية معلومات موضحة أدناه.\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,55 +72,55 @@
 "المعلومات.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "الحفاظ على ضبط\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "غيّر حجم"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "غيّر حجم جميع الإطارات"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "أيّ"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "بدون"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "مستحسن"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "معطّل !"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**التخطيط الحالي**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "تحميل إضافات مؤثرات الوقت الحقيقي..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "بدء خادوم جاك الصوت..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr "بدء خادوم نقل جاك"
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr "يتصل بخادوم نقل جاك"
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "بدء خادوم بالص-اوديو..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "التحقق من إكتشاف التبعيات"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "تم العثور علي mplayer"
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "لم يتم العثور علي mplayer"
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "تم العثور علي convert"
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "لم يتم العثور علي convert"
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "تم العثور علي composite"
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "لم يتم العثور علي composite"
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "تم العثور على .'sox'\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "لم يتم العثور على .'sox'\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "إكتشاف...'cdda2wav'..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "عدم إكتشاف...'cdda2wav'..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "إكتشاف ...جاك..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "عدم إكتشاف ...جاك..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/ca.po -> LiVES-1.4.8.tar.bz2/po/ca.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 12:08+0000\n"
 "Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +42,7 @@
 "group_id=64341&atid=507139\n"
 "Gràcies. La recuperació ha de ser possible si es reinicia LiVES.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -54,7 +54,7 @@
 "Quan es notifiqui una falla, si us plau poseu les dades del vostre sistema "
 "operatiu, distribució i la versió de LIVES ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "Tot seguit hi haurà alguna informació:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,55 +72,55 @@
 "informació.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Grup de seguretat.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Redimensionat"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "reconfigureu totes les finestres"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "qualsevol"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Cap"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "Recomanat"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "Espatllat"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**El disseny actual**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Carregant connexió d'efectes reals"
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Començant connexió de servidor d'audio jack..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Començant servidor d'audio pulsant..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Comprovant dependències opcionals:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...detectat..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NO S'HA DETECTAT..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "detectat convertidor"
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "NO S'HA DETECTAT convertidor"
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "detectada composició"
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "NO S'HA DETECTAT composició"
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...detectat...\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NO S'HA DETECTAT...\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NO S'HA DETECTAT..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NO S'HA DETECTAT..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/cs.po -> LiVES-1.4.8.tar.bz2/po/cs.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: LiVEScz\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 12:09+0000\n"
 "Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: <martin@svobodicz.com, ales@mur.at>\n"
@@ -21,7 +21,7 @@
 "X-Poedit-Country: CZECH REPUBLIC\n"
 "X-Poedit-Language: Czech\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -30,7 +30,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -44,7 +44,7 @@
 "group_id=64341&atid=507139\n"
 "Dzięki. Odzyskiwanie powinno być możliwe po uruchomieniu LiVES.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -56,7 +56,7 @@
 "Przy zgłaszaniu awarii, należy podać szczegółowe informacje na temat systemu "
 "operacyjnego, dystrybucję i wersję LiVES ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -64,62 +64,62 @@
 "oraz wszelkie informacje przedstawione poniżej:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Zachování nastavení.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Měním velikost"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "Změnit velikost všech _snímků"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Libovolný"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Žádný"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "doporučeno"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "zakázáno!"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**Bieżący układ**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Načítám pluginy pro efekty v reálném času..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Spouštím zvukový server JACK..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -130,95 +130,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Kontrola dodatečných závislostí:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer... nalezen..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NENALEZEN..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert... nalezen..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert... NENALEZEN..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite... nalezen..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite... NENALEZEN..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox... nalezen\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox... NENALEZEN\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav... nalezen..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav... NENALEZEN..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd... nalezen..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd... NENALEZEN..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."
 msgstr "pulse audio...wykryto..."

LiVES-1.4.7.tar.bz2/po/da.po -> LiVES-1.4.8.tar.bz2/po/da.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2010-04-11 02:27+0000\n"
 "Last-Translator: AJenbo <anders@jenbo.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -37,7 +37,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -45,68 +45,68 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Ændrer størrelse"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr ""
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Enhver"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Ingen"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "anbefalet"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr ""
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr ""
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -117,95 +117,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1385

LiVES-1.4.7.tar.bz2/po/de_DE.po -> LiVES-1.4.8.tar.bz2/po/de_DE.po Changed

@@ -3,7 +3,7 @@
 "Project-Id-Version: Lives 0.9.5\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-06-03 07:11+0000\n"
 "Last-Translator: Dominik Dehning <Unknown>\n"
 "Language-Team: Herbert U. Hübner <herbert.u.huebner@friendglow.net>\n"
@@ -16,7 +16,7 @@
 "X-Poedit-Country: GERMANY\n"
 "X-Poedit-Language: German\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -25,7 +25,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -39,7 +39,7 @@
 "group_id=64341&atid=507139\n"
 "Danke. Recovery sollte es möglich sein, wenn Sie LiVES neu zu starten.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -51,7 +51,7 @@
 "Bei der Meldung abstürzt, fügen Sie bitte Angaben zu Ihrem Betriebssystem, "
 "den Vertrieb und das LiVES-Version ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -59,7 +59,7 @@
 "und alle folgenden Informationen angezeigt:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -69,55 +69,55 @@
 "weitere Informationen zu sammeln.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Haltbare Menge.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Skalieren"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Skaliere alle Frames"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Jede/s"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Keine/n"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "Empfohlen"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "deaktiviert !"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**Das aktuelle Layout**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Lade Echtzeiteffektplugins..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Starte den Jack Audio Server..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -128,95 +128,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Starte PulseAudio Server"
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Optionelle Abhängigkeiten werden überprüft:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer ...gefunden"
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...nicht gefunden..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...gefunden..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...nicht gefunden..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...gefunden..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...nicht gefunden..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "SoX...gefunden\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "SoX...nicht gefunden\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...gefunden..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...nicht gefunden..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...gefunden..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NICHT GEFUNDEN..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/en_GB.po -> LiVES-1.4.8.tar.bz2/po/en_GB.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 12:08+0000\n"
 "Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +42,7 @@
 "group_id=64341&atid=507139\n"
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -54,7 +54,7 @@
 "When reporting crashes, please include details of your operating system, "
 "distribution, and the LiVES version ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "and any information shown below:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,55 +72,55 @@
 "information.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Preserving set.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Resizing"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Resize All Frames"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Any"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "None"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "recommended"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "disabled !"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**The current layout**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Loading realtime effect plugins..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Starting jack audio server..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Starting pulse audio server..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Checking optional dependencies:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...detected..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NOT DETECTED..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...detected..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NOT DETECTED..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...detected..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NOT DETECTED..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...detected\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NOT DETECTED\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detected..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NOT DETECTED..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...detected..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NOT DETECTED..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/es.po -> LiVES-1.4.8.tar.bz2/po/es.po Changed

@@ -8,18 +8,18 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
-"PO-Revision-Date: 2011-09-22 05:04+0000\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
+"PO-Revision-Date: 2011-11-06 20:39+0000\n"
 "Last-Translator: Fitoschido <fitoschido@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-13 15:08+0000\n"
-"X-Generator: Launchpad (build 14124)\n"
+"X-Launchpad-Export-Date: 2011-11-26 11:33+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,7 +33,7 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -47,7 +47,7 @@
 "group_id=64341&atid=507139\n"
 "Gracias. Debería poder recuperar su sesión reiniciando LiVES.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -59,7 +59,7 @@
 "Cuando informe del problema, incluya detalles de su sistema operativo, "
 "distribución, y la versión de LiVES ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,7 +67,7 @@
 "y la información mostrada debajo:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -77,55 +77,55 @@
 "información.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Conjunto preservado.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Redimensionar todos los cuadros"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Cualquiera"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Ninguno"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "recomendado"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "desactivado"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**La disposición actual**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Cargando complementos de efectos en tiempo real..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Iniciando el servidor de audio jack..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -136,95 +136,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Iniciando servidor PulseAudio..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Comprobando dependencias opcionales:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer... detectado..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NO DETECTADO..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert... Detectado..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert... No Detectado"
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite... detectado..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite... No Detectado"
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox... detectado\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox... No Detectado\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav... detectado"
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav... NO DETECTADO..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd... detectado..."
 
-#: src/main.c:1383
+#: src/main.c:1401

LiVES-1.4.7.tar.bz2/po/et.po -> LiVES-1.4.8.tar.bz2/po/et.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 12:02+0000\n"
 "Last-Translator: Tarmo Ilves <tarmo.ilves.001@mail.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +42,7 @@
 "group_id=64341&atid=507139\n"
 "Aitäh. Peaks olema võimalik progress taastada LiVES-i taaskäivitusel.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -54,7 +54,7 @@
 "Vigadest teatades, palun lisage infot oma operatsioonisüsteemist, jaotusest "
 "ja LiVES-i versioonist ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "ja mis tahes allpool esitatud teave:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,55 +72,55 @@
 "infot.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Valiku säilitamine.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Mõõtmete muutmine"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_kõikide kaadrite suuruse muutmine"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Kõik"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Pole"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "soovitatav"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "keelatud !"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**Praegune skeem**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Laen reaalaja efektide pluginaid..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Heli serveri jack käivitamine..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Heli serveri pulse käivitamine..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...tuvastatud..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...ei tuvastatud..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "konverdi...tuvastatud..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "konversioon...ei tuvastatud..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "komposiit...tuvastatud.."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "komposiit...ei tuvastatud..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...tuvastatud\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...ei tuvastatud\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/fi.po -> LiVES-1.4.8.tar.bz2/po/fi.po Changed

@@ -8,18 +8,18 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
-"PO-Revision-Date: 2011-08-18 12:07+0000\n"
-"Last-Translator: Jussi Aalto <Unknown>\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
+"PO-Revision-Date: 2011-10-18 16:25+0000\n"
+"Last-Translator: Juhani Numminen <juhaninumminen0@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-11-26 11:33+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,7 +33,7 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -48,7 +48,7 @@
 "Kiitos. Palautumisen tulisi olla mahdollista uudelleen käynnistäessäsi "
 "ohjelman.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -60,7 +60,7 @@
 "Raportoidessasi kaatumisista, sisällytä käyttöjärjestelmän tiedot, "
 "jakeluversio ja LiVESin versiotiedot ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -68,7 +68,7 @@
 "ja alla olevat tiedot:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -78,55 +78,55 @@
 "lisätietoja.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Säilytetään leikesarja.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Koon muutos"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "Muuta kaikkien kuvien k_okoa"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Mikä tahansa"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Ei mitään"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "suositeltu"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "kytketty pois päältä!"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**Nykyinen asettelu**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Ladataan reaaliaikaiset tehosteliitännäiset..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Käynnistetään jack-äänipalvelin..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr "Käynnistetään jack-välityspalvelin..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr "Yhdistetään jack-välityspalvelimeen..."
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -137,95 +137,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Käynnistetään pulse audio -palvelin..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Tarkistetaan valinnaiset riippuvuudet:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...havaittu..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...EI HAVAITTU..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...havaittu..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...EI HAVAITTU..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...havaittu..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...EI HAVAITTU..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...havaittu\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...EI HAVAITTU\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...havaittu..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...EI HAVAITTU..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...havaittu..."
 
-#: src/main.c:1383

LiVES-1.4.7.tar.bz2/po/fr.po -> LiVES-1.4.8.tar.bz2/po/fr.po Changed

@@ -10,7 +10,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 12:06+0000\n"
 "Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: Français <kwizart@gmail.com>\n"
@@ -23,7 +23,7 @@
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-Language: French\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -32,7 +32,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -46,7 +46,7 @@
 "tracker/?group_id=64341&atid=507139\n"
 "Merci. Une récupération devrait être possible si vous redémarrez LiVES.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -59,7 +59,7 @@
 "détails de votre système d'exploitation, la distribution, et la version de "
 "LiVES ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,7 +67,7 @@
 "et toute autre information indiquée ci-dessous:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -77,55 +77,55 @@
 "recueillir plus d'informations.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Marque positionnée.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Recadrage"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Recadre Toutes Les Images"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Tous"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Aucun"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "recommandé"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "désactivé !"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**La configuration actuelle**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Chargement des plugins d'effets en temps réel"
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Démarrage du serveur audio jack..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr "Lancement du serveur de transport Jack..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr "Connexion au serveur de transport Jack..."
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -136,95 +136,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Initialisation du serveur audio pulse..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Verification des dépendances optionnelles:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer....détecté..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON DÉTECTÉ..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...détecté..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON DÉTECTÉ..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...détecté..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON DÉTECTÉ..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...détecté\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON DÉTECTÉ\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...détecté..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NON DÉTECTÉ..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...détecté..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON DÉTECTÉ..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/gl.po -> LiVES-1.4.8.tar.bz2/po/gl.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 12:09+0000\n"
 "Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +42,7 @@
 "group_id=64341&atid=507139\n"
 "Grazas. A recuperación debe ser posible se reinicia LiVES.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -54,7 +54,7 @@
 "Cando falla de información, por favor inclúa os detalles do seu sistema "
 "operativo, distribución, ea versión LiVES ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "e todas as informacións que aparecen a continuación:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,55 +72,55 @@
 "máis información.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Preservar set.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Redimensionar todos os cadros"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Calquer"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Ningún"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "recomendado"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "minusválidos !"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "** O esquema actual **"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Comprobar dependencias opcionais:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...detectados..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON DETECTA..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...detectados..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON DETECTA..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...detectados..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON DETECTA..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...detectados\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON DETECTA\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectados..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NON DETECTA..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...detectados..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON DETECTA..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/he.po -> LiVES-1.4.8.tar.bz2/po/he.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 12:10+0000\n"
 "Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,7 +33,7 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -47,7 +47,7 @@
 "group_id=64341&atid=507139\n"
 "תודה. ניתן לשחזר את הנתונים שאבדו בהפעלה מחדש של LiVES.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -59,7 +59,7 @@
 "בעת דיווח על קריסות, נא לכלול פרטים על מערכת ההפעלה שלך, ההפצה וגרסת ה־LiVES "
 "שבשימוש ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,7 +67,7 @@
 "וכל מידע זמין מוצג כאן:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -77,55 +77,55 @@
 "מידע.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "מתבצע שימור האוסף.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "שינוי גודל"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_שינוי גודל כל השקופיות"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "הכל"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "ללא"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "מומלץ"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "נוטרל !"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**הפריסה הנוכחית**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "מתבצעת טעינת תוספים לאפקטים בזמן אמת..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "מתבצעת הפעלת שרת השמע jack..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr "מפעיל את שרת התעבורה של jack..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr "מתחבר לשרת התעבורה של jack..."
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -136,95 +136,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "מפעיל את שרת השמע Pulse..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "מתבצעת בדיקת חבילות תלות אפשריות:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...זוהה..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...לא זוהה..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...זוהה..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...לא זוהה..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...זוהה..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...לא זוהה..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...זוהה...\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...לא זוהה...\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...זוהה"
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...לא זוהה"
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...זוהה..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...לא זוהה..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/hr.po -> LiVES-1.4.8.tar.bz2/po/hr.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 11:59+0000\n"
 "Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +42,7 @@
 "group_id=64341&atid=507139\n"
 "Hvala. Oporavak bi trebao biti moguće ako se ponovno LiVES.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -54,7 +54,7 @@
 "Kada izvještavanje crashes, molimo uključite detalje vašeg operacijskog "
 "sustava, distribucije, a LiVES verzija ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "i sve podatke prikazane u nastavku:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,55 +72,55 @@
 "prikupljanja više infomacija.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Očuvanje set.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Promjena veličine"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr ""
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Bilo koji"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Nijedan"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "preporučeno"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "isključeno !"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**Trenutni izgled**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Učitavanje stvarnom efekt čep..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Pokrećem jack audio poslužitelj..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr "Pokrećem jack transport server..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr "Spajanje na jack transport server..."
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Pokrećem pulse audio poslužitelj..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Provjera izborno ovisnosti:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...pronađen..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIJE PRONAĐEN..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...pronađen..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NIJE PRONAĐEN..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...otkriti..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NIJE OTKRIVENA..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...pronađen\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NIJE PRONAĐEN...\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...pronađen..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NIJE PRONAĐEN..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...pronađen..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NIJE PRONAĐEN..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/hu.po -> LiVES-1.4.8.tar.bz2/po/hu.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 11:58+0000\n"
 "Last-Translator: Krasznecz Zoltán <zoltan.krasznecz@gmail.com>\n"
 "Language-Team: Magyar <lisovszki@gmail.com>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +42,7 @@
 "group_id=64341&atid=507139\n"
 "Köszönjük. A LiVES újraindításával helyreállítható a program.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -54,7 +54,7 @@
 "Összeomlások bejelentésénél kérjük add meg a rendszered adatait és a LiVES "
 "verziószámát. ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "és minden lent szereplő információt:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,55 +72,55 @@
 "beiktatásával, hogy további információkat tudhass meg.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Tartós beállítás.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Átméretezés"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Minden képkocka átméretezése"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Bármely"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Nincs"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "ajánlott"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "tíltva!"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**A jelenlegi kimenet**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Az azonnali effektek betöltése..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Jack audió szerver indítása"
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Pulse audio szerver indítása..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Ajánlott függőségek ellenőrzése"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...megtalálva"
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NEM TALÁLOM.."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...megtalálva"
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NEM TALÁLOM"
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...megtalálva..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NEM TALÁLOM"
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...megtalálva\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NEM TALÁLOM\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...megtalálva..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NEM TALÁLOM..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...megtalálva..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NEM TALÁLOM..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/it.po -> LiVES-1.4.8.tar.bz2/po/it.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 12:01+0000\n"
 "Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +42,7 @@
 "group_id=64341&atid=507139\n"
 "Grazie. Dovrebbe essere possibile un recupero se riavvii LiVES.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -54,7 +54,7 @@
 "Durante la segnalazione di crash, per piacere fornisci informazioni sul tuo "
 "sistema operativo, distribuzione, e la versione di LiVES ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "e qualsiasi altra informazione mostrata qua sotto:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,55 +72,55 @@
 "più informazioni.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Preservazione del set in corso.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Ridimensionamento"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Ridimensiona Tutti I Fotogrammi"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Qualsiasi"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Nessuno"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "consigliato"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "disabilitato !"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**Il layout corrente**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Caricamento dei plugin degli effetti in tempo reale in corso..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Avvio del server audio jack in corso..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Avviando il server audio pulse..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Controllo delle dipendenze opzionali in corso:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...rilevato..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON RILEVATO..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...rilevato..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON RILEVATO..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...rilevato..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON RILEVATO..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...rilevato...\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON RILEVATO...\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...rilevato..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NON RILEVATO..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...rilevato..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON RILEVATO..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/ja.po -> LiVES-1.4.8.tar.bz2/po/ja.po Changed

@@ -8,18 +8,18 @@
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
-"PO-Revision-Date: 2011-09-09 01:15+0000\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
+"PO-Revision-Date: 2011-11-24 01:44+0000\n"
 "Last-Translator: Takashi Sakamoto <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-13 15:08+0000\n"
-"X-Generator: Launchpad (build 14124)\n"
+"X-Launchpad-Export-Date: 2011-11-26 11:32+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +42,7 @@
 "してください。\n"
 "ご協力ありがとうございます。LiVESを再起動すれば復元が行われるでしょう。\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -54,7 +54,7 @@
 "クラッシュ報告する際は、使用しているOS・ディストリビューションやLiVESのバー"
 "ジョンなどの詳細も含めてください ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "また、以下の情報もお願いします:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,55 +72,55 @@
 "と共に実行してください。\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "セットの保護\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "リサイズ"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "全フレームのリサイズ(_R)"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "任意"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "なし"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "推奨"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "使用不能！"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**現在のレイアウト**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "リアルタイムエフェクトプラグインを読み込み中..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "JACKサーバーの音声機能を開始しています..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr "JACKサーバーのトランスポート機能を開始しています..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr "JACKサーバーのトランスポート機能に接続しています..."
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -139,95 +139,95 @@
 "あるいは、LiVESを次のプログラムと共に起動して試してください: \"lives -"
 "jackopts 16\"、 "
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "PulseAudioサーバーを開始しています..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "必ずしも必要ではない依存関係を確認しています:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayerが見つかりました..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayerは見つかりませんでした..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convertが見つかりました..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convertは見つかりませんでした..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "compositeが見つかりました..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "compositeは見つかりませんでした..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "soxが見つかりました\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "soxは見つかりませんでした\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wavが見つかりました..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wavは見つかりませんでした..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackdが見つかりました..."
 
-#: src/main.c:1383
+#: src/main.c:1401

LiVES-1.4.7.tar.bz2/po/lives.pot -> LiVES-1.4.8.tar.bz2/po/lives.pot Changed

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lives 1.4.7\n"
+"Project-Id-Version: lives 1.4.8\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,7 +27,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -36,7 +36,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -44,68 +44,68 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr ""
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr ""
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr ""
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr ""
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr ""
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr ""
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr ""
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -116,95 +116,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1384
+#: src/main.c:1402

LiVES-1.4.7.tar.bz2/po/nl_NL.po -> LiVES-1.4.8.tar.bz2/po/nl_NL.po Changed

@@ -3,7 +3,7 @@
 "Project-Id-Version: LiVES 0.9.5cvs\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2010-01-12 10:14+0000\n"
 "Last-Translator: cumulus007 <cumulus0007@gmail.com>\n"
 "Language-Team: \n"
@@ -16,7 +16,7 @@
 "X-Poedit-Country: NETHERLANDS\n"
 "X-Poedit-Language: Dutch\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -25,7 +25,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -34,7 +34,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -42,70 +42,70 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Grootte aanpassen"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr ""
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Welke dan ook"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Geen"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "aanbevolen"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "uitgeschakeld"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr ""
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Jack audio server starten ..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 #, fuzzy
 msgid "Starting jack transport server..."
 msgstr "Jack audio server starten ..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 #, fuzzy
 msgid "Connecting to jack transport server..."
 msgstr "Jack audio server starten ..."
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -116,95 +116,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Optionele afhankelijkheden aan het controleren:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...gevonden..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIET GEDETECTEERD..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...gedetecteerd..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NIET GEDETECTEERD..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...gedetecteerd..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NIET GEDETECTEERD..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...gedetecteerd\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NIET GEDECTEERD\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...gedetecteerd..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NIET GEDETECTEERD..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."
 msgstr ""

LiVES-1.4.7.tar.bz2/po/oc.po -> LiVES-1.4.8.tar.bz2/po/oc.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 12:12+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -37,7 +37,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -45,7 +45,7 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -53,62 +53,62 @@
 "e tota autra informacion indicada çaijós :\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Marca posicionada.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Redimensionament"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Requadra Totes Los Imatges"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Quin que siá"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Pas cap"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "recomandat"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "desactivat !"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**La configuracion actuala**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Cargament dels plugins d'efièches en temps real"
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Aviada del servidor àudio jack..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -119,95 +119,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Inicializacion del servidor àudio pulse..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Verificacion de las dependéncias opcionalas :"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer....detectat..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...PAS DETECTAT..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...detectat..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...PAS DETECTAT..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...detectat..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...PAS DETECTAT..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...detectat\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...PAS DETECTAT\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...PAS DETECTAT..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...PAS DETECTAT..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectat..."

LiVES-1.4.7.tar.bz2/po/pl.po -> LiVES-1.4.8.tar.bz2/po/pl.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-09-18 02:25+0000\n"
 "Last-Translator: pp/bs <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-10-13 15:08+0000\n"
 "X-Generator: Launchpad (build 14124)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +42,7 @@
 "group_id=64341&atid=507139\n"
 "Dzięki. Odzyskiwanie powinno być możliwe po uruchomieniu życia.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -54,7 +54,7 @@
 "Przy zgłaszaniu awarii, należy podać szczegółowe informacje na temat systemu "
 "operacyjnego, dystrybucję i wersję LiVES ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "oraz wszelkie informacje przedstawione poniżej:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,55 +72,55 @@
 "więcej informacji.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Skalowanie"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Skaluj Wszystkie Klatki"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Dowolny"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Żaden"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "zalecane"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "niepełnosprawnych !"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**Obecny układ**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Uruchamianie serwera pulse audio"
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Sprawdzanie zależności opcjonalne:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...  wykryto..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIE WYKRYTO..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...wykrytych..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NIE WYKRYTO..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...wykrytych..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NIE WYKRYTO..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...wykrytych\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NIE WYKRYTO\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...wykrytych..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NIE WYKRYTO..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...wykrytych..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NIE WYKRYTO..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/pt.po -> LiVES-1.4.8.tar.bz2/po/pt.po Changed

@@ -3,7 +3,7 @@
 "Project-Id-Version: LiVES\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 12:00+0000\n"
 "Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: pixel <vjpixel@gmail.com>\n"
@@ -16,7 +16,7 @@
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -25,7 +25,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -39,7 +39,7 @@
 "group_id=64341&atid=5071 39\n"
 "Obrigado. A recuperação deve ser possível se você reiniciar LiVES.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -51,7 +51,7 @@
 "Quando falha de informação, por favor inclua detalhes de seu sistema "
 "operacional, a distribuição ea versão do LiVES ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -59,62 +59,62 @@
 "e todas as informações mostradas abaixo:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Preservando set.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "A redimensionar"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Redimensionar Todos Frames"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Qualquer"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Nenhum"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "recomendado"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "desactivado!"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**O layout atual**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "A carregar plugins de efeito em tempo real..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "A iniciar servidor de jack audio..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -125,95 +125,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "A verificar as dependências opcionais:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...detectado..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NÃO DETECTADO..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...detectado..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NÃO DETECTADO..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...detectado\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NÃO DETECTADO...\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectado..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NÃO DETECTADO..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...detectado..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NÃO DETECTADO..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectados..."

LiVES-1.4.7.tar.bz2/po/pt_BR.po -> LiVES-1.4.8.tar.bz2/po/pt_BR.po Changed

@@ -3,7 +3,7 @@
 "Project-Id-Version: LiVES\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 12:03+0000\n"
 "Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: pixel <vjpixel@gmail.com>\n"
@@ -16,7 +16,7 @@
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -25,7 +25,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -39,7 +39,7 @@
 "group_id=64341&atid=507139\n"
 "Obrigado. Os dados podem ser recuperados se você reiniciar o LiVes.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -51,7 +51,7 @@
 "Ao reportar travamentos, por favor informe qual o seu sistema operacional, "
 "distribuição e a versão do LiVES ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -59,7 +59,7 @@
 "e toda informação mostrada abaixo:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -69,55 +69,55 @@
 "seja coletada mais informações.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Preservando set.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Redimensionar Todos Frames"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Qualquer"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Nenhum"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "recomendado"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "desativado!"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**Layout atual**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Carregando plugins de efeitos em tempo real..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Iniciando servidor de áudio jack..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr "Iniciando o servidor jack de transporte..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr "Conectando ao servidor jack de transporte..."
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -128,95 +128,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Iniciando o servidor pulse audio..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Checando dependências opcionais:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...detectado..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NÃO DETECTADO..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...detectado..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NÃO DETECTADO..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...detectado\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NÃO DETECTADO...\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectado..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NÃO DETECTADO..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...detectado..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NÃO DETECTADO..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/ro.po -> LiVES-1.4.8.tar.bz2/po/ro.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 11:57+0000\n"
 "Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -43,7 +43,7 @@
 "Mulţumesc. De recuperare ar trebui să fie posibilă în cazul în care "
 "reporniţi LiVES.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -55,7 +55,7 @@
 "Atunci când se blochează de raportare, vă rugăm să includă detalii cu "
 "privire la sistemul de operare, de distribuţie, precum şi LiVES versiunea ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -63,7 +63,7 @@
 "şi orice alte informaţii prezentate mai jos:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -73,55 +73,55 @@
 "multe informații.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Păstrarea set.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Redimensionare"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Redimensionarea tuturor cadrelor"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Orice"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Nimic"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "recomandat"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "dezactivat !"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "** Structura actuală **"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Se incarcă modulele de efecte in timp real..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Pornirea serverului audio jack..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -132,95 +132,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Pornirea serverului audio pulse..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Verificarea dependenţelor opţionale:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...a fost detectat..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... nu a fost detectat..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...detectat..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NU A FOST DETECTAT..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...detectat..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NU A FOST DETECTAT..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...detectat\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NU A FOST DETECTAT\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NU A FOST DETECTAT..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NU A FOST DETECTAT..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/ru.po -> LiVES-1.4.8.tar.bz2/po/ru.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 11:56+0000\n"
 "Last-Translator: Alexey Ivanov <alexey.ivanes@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,7 +33,7 @@
 "Все переводчики должны прочитать заметки по переводу LiVES на\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -47,7 +47,7 @@
 "tracker/?group_id=64341&atid=507139\n"
 "Спасибо. Для восстановления перезапустите LiVES.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -59,7 +59,7 @@
 "В отчете об ошибке, пожалуйста, сообщите о вашей операционной системе, "
 "дистрибутиве, а также версию LiVES ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,7 +67,7 @@
 "и другую информацию, как указано ниже:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -77,55 +77,55 @@
 "чтобы собрать больше информации.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Сохранение сборки.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Масштабирование"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Масштабировать все кадры"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Любой"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Нет"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "рекомендуемые"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "отключено!"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "Текущее размещение"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Загрузка плагина эффектов реального времени..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Запуск звукового сервера jack..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr "Запуск передающего сервера jack..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr "Подключение к передающему jack-серверу..."
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -136,95 +136,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Запуск сервера pulse audio..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Проверка опциональных зависимостей:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...обнаружен..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...обнаружен..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...обнаружен..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...обнаружен...\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...НЕ ОБНАРУЖЕН...\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...обнаружен..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...обнаружен..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.7.tar.bz2/po/sk.po -> LiVES-1.4.8.tar.bz2/po/sk.po Changed

@@ -8,18 +8,18 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
-"PO-Revision-Date: 2011-08-18 12:03+0000\n"
-"Last-Translator: salsaman <salsaman@gmail.com>\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
+"PO-Revision-Date: 2011-11-01 11:47+0000\n"
+"Last-Translator: milboy <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-11-26 11:33+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,7 +33,7 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -47,7 +47,7 @@
 "group_id=64341&atid=507139\n"
 "Ďakujeme. Obnovenie by malo byť možné po reštartovaní LiVES.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -59,7 +59,7 @@
 "Pri nahlasovaní neočakávaných skončení, prosím uveďte podrobnosti o "
 "operačnom systéme, distribúcii a verzii LiVES ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,7 +67,7 @@
 "a všetky informácie uvedené nižšie:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -77,55 +77,55 @@
 "zhromaždenie viac informácií.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Nastavenie zachovania.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
-msgstr "Zmeniť veľkosť"
+msgstr "Zmena veľkosti"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Zmeniť veľkosť všetkých snímkov"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Ktorýkoľvek"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Žiaden"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "doporučené"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "zakázané !"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**Súčasné rozloženie**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Načítavam efekt rozšírenia v réálnom čase..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Spúšťam zvukový server jack..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -136,95 +136,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Spúšťam pulse audio server..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Kontrola dodatočných záavislostí:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...nájdený..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NENÁJDENÝ..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...nájdený..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NENÁJDENÝ..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...nájdený..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NENÁJDENÝ..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...nájdený\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NENÁJDENÝ\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...nájdený..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NENÁJDENÝ..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...nájdený..."

LiVES-1.4.7.tar.bz2/po/te.po -> LiVES-1.4.8.tar.bz2/po/te.po Changed

@@ -8,18 +8,18 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
-"PO-Revision-Date: 2010-02-21 21:28+0000\n"
-"Last-Translator: salsaman <salsaman@gmail.com>\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
+"PO-Revision-Date: 2011-11-06 17:53+0000\n"
+"Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"
 "Language-Team: Telugu <te@li.org>\n"
 "Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-11-26 11:33+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -37,7 +37,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -45,68 +45,68 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
-msgstr ""
+msgstr "పరిమాణం మార్చుట"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr ""
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "ఏదైనా"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "ఏదీ వద్దు"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr ""
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr ""
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr ""
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -117,95 +117,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."

LiVES-1.4.7.tar.bz2/po/tr.po -> LiVES-1.4.8.tar.bz2/po/tr.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
 "PO-Revision-Date: 2011-08-18 12:12+0000\n"
 "Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -43,7 +43,7 @@
 "Teşekkür ederiz. Eğer LiVES yeniden başlatırsanız çalışmanızı kurtarmanız "
 "mümkündür.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -55,7 +55,7 @@
 "Lütfen hata raporuna İşletim sistemi, dağıtım ve LiVES sürüm bilgilerini "
 "ekleyiniz ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -63,7 +63,7 @@
 "ve daha fazla bilgi aşağıda gösterilmiştir:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -73,55 +73,55 @@
 "birlikte çalıştırın.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Koruma ayarları.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Yeniden boyutlandırma"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "Tüm çerçeveleri yeniden boyutlandır"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Herhangi"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Boş"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "tavsiye"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "Engelli!"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**Mevcut yerleşim düzeni**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Gerçek zaman efekt eklentileri yükleniyor"
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Jack audio sunucusu başlıyor..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr "Jack taşıma sunucusu başlıyor"
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr "Jack taşıma sunucusuna bağlanılıyor"
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -132,95 +132,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Pulse audio sunucusu başlıyor"
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Isteğe bağlı bağımlılıkları denetleme:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer ... bulundu ..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer ... BULUNAMADI ..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...bulundu..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...BULUNAMADI..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite ... bulundu ..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite ... BULUNAMADI ..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...bulundu\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...BULUNAMADI\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...bulundu..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...BULUNAMADI..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...bulundu..."
 
-#: src/main.c:1383
+#: src/main.c:1401
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...BULUNAMADI..."
 
-#: src/main.c:1384
+#: src/main.c:1402
 msgid "pulse audio...detected..."

LiVES-1.4.8.tar.bz2/po/ug.po Added

@@ -0,0 +1,8925 @@
+# Uyghur translation for lives
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the lives package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lives\n"
+"Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
+"group_id=64341&atid=507139\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
+"PO-Revision-Date: 2011-11-07 04:09+0000\n"
+"Last-Translator: Gheyret T.Kenji <Unknown>\n"
+"Language-Team: Uyghur <ug@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-08 11:04+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#: src/main.c:116
+msgid ""
+"Attention Translators !\n"
+"This message is intended for you, so please do not translate it.\n"
+"\n"
+"All translators should read the LiVES translation notes at\n"
+"http://lives.sourceforge.net/TRANS-README.txt"
+msgstr ""
+
+#: src/main.c:132
+msgid ""
+"\n"
+"Unfortunately LiVES crashed.\n"
+"Please report this bug at http://sourceforge.net/tracker/?"
+"group_id=64341&atid=507139\n"
+"Thanks. Recovery should be possible if you restart LiVES.\n"
+msgstr ""
+
+#: src/main.c:133
+msgid ""
+"\n"
+"\n"
+"When reporting crashes, please include details of your operating system, "
+"distribution, and the LiVES version ("
+msgstr ""
+
+#: src/main.c:136
+msgid ""
+"and any information shown below:\n"
+"\n"
+msgstr ""
+
+#: src/main.c:140
+msgid ""
+"Please install gdb and then run LiVES with the -debug option to collect more "
+"information.\n"
+"\n"
+msgstr ""
+
+#: src/main.c:148
+msgid "Preserving set.\n"
+msgstr ""
+
+#: src/main.c:497
+msgid "Resizing"
+msgstr ""
+
+#: src/main.c:504
+msgid "_Resize All Frames"
+msgstr ""
+
+#: src/main.c:765
+msgid "Any"
+msgstr "خالىغان"
+
+#: src/main.c:766
+msgid "None"
+msgstr "يوق"
+
+#: src/main.c:767
+msgid "recommended"
+msgstr "تەۋسىيە قىلغان"
+
+#: src/main.c:768
+msgid "disabled !"
+msgstr "چەكلەنگەن!"
+
+#: src/main.c:769
+msgid "**The current layout**"
+msgstr ""
+
+#: src/main.c:1219
+msgid "Loading realtime effect plugins..."
+msgstr ""
+
+#: src/main.c:1272
+msgid "Starting jack audio server..."
+msgstr ""
+
+#: src/main.c:1274
+msgid "Starting jack transport server..."
+msgstr ""
+
+#: src/main.c:1275
+msgid "Connecting to jack transport server..."
+msgstr ""
+
+#: src/main.c:1302
+msgid ""
+"\n"
+"\n"
+"Manual start of jackd required. Please make sure jackd is running, \n"
+"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"and restart LiVES.\n"
+"\n"
+"Alternatively, try to start lives with either \"lives -jackopts 16\", or "
+msgstr ""
+
+#: src/main.c:1326
+msgid "Starting pulse audio server..."
+msgstr ""
+
+#: src/main.c:1389
+msgid "Checking optional dependencies:"
+msgstr ""
+
+#: src/main.c:1390
+msgid "mplayer...detected..."
+msgstr ""
+
+#: src/main.c:1391
+msgid "mplayer...NOT DETECTED..."
+msgstr ""
+
+#: src/main.c:1392
+msgid "convert...detected..."
+msgstr ""
+
+#: src/main.c:1393
+msgid "convert...NOT DETECTED..."
+msgstr ""
+
+#: src/main.c:1394
+msgid "composite...detected..."
+msgstr ""
+
+#: src/main.c:1395
+msgid "composite...NOT DETECTED..."
+msgstr ""
+
+#: src/main.c:1396
+msgid "sox...detected\n"
+msgstr ""
+
+#: src/main.c:1397
+msgid "sox...NOT DETECTED\n"
+msgstr ""
+
+#: src/main.c:1398
+msgid "cdda2wav...detected..."
+msgstr ""
+
+#: src/main.c:1399
+msgid "cdda2wav...NOT DETECTED..."
+msgstr ""
+
+#: src/main.c:1400
+msgid "jackd...detected..."
+msgstr ""
+
+#: src/main.c:1401
+msgid "jackd...NOT DETECTED..."
+msgstr ""
+
+#: src/main.c:1402
+msgid "pulse audio...detected..."
+msgstr ""
+
+#: src/main.c:1403
+msgid "pulse audio...NOT DETECTED..."
+msgstr ""
+
+#: src/main.c:1404
+msgid "python...detected..."
+msgstr ""
+
+#: src/main.c:1405
+msgid "python...NOT DETECTED..."
+msgstr ""
+
+#: src/main.c:1406
+msgid "dvgrab...detected..."
+msgstr ""
+
+#: src/main.c:1407
+msgid "dvgrab...NOT DETECTED..."
+msgstr ""
+

LiVES-1.4.7.tar.bz2/po/uk.po -> LiVES-1.4.8.tar.bz2/po/uk.po Changed

@@ -2,24 +2,24 @@
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the lives package.
 #
-# Yuri Chornoivan <yurchor@gmail.com>, 2010.
+# Yuri Chornoivan <yurchor@gmail.com>, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
-"PO-Revision-Date: 2011-09-21 10:14+0000\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
+"PO-Revision-Date: 2011-11-07 13:09+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-13 15:08+0000\n"
-"X-Generator: Launchpad (build 14124)\n"
+"X-Launchpad-Export-Date: 2011-11-26 11:33+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,7 +33,7 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -47,7 +47,7 @@
 "group_id=64341&atid=507139\n"
 "Дякуємо. Відновити дані можна буде після перезапуску LiVES.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -59,7 +59,7 @@
 "Будь ласка, у повідомленнях про помилки у програмі вказуйте назву вашої "
 "операційної системи, дистрибутива та номер версії LiVES ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,7 +67,7 @@
 "а також дані, наведені нижче:\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -77,55 +77,55 @@
 "зібрати більше даних.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "Збереження набору.\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "Зміна розміру"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "_Змінити розміри всіх кадрів"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "Будь-який"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Жодного"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "найліпший"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "вимкнено!"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**Поточне компонування**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "Завантаження додатків ефектів реального часу…"
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "Запуск звукового сервера jack…"
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr "Запуск сервера передавання даних jack…"
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr "Встановлення з’єднання з сервером передавання даних jack…"
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -143,95 +143,95 @@
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "Запуск звукового сервера PulseAudio…"
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "Пошук додаткових залежностей:"
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer… виявлено…"
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert…виявлено…"
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite…виявлено…"
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox…виявлено\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox…НЕ ВИЯВЛЕНО\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...виявлено..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...НЕ ВИЯВЛЕНО..."

LiVES-1.4.7.tar.bz2/po/uz.po -> LiVES-1.4.8.tar.bz2/po/uz.po Changed

@@ -8,18 +8,18 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
-"PO-Revision-Date: 2010-02-21 21:45+0000\n"
-"Last-Translator: salsaman <salsaman@gmail.com>\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
+"PO-Revision-Date: 2011-11-10 17:30+0000\n"
+"Last-Translator: Akmal Xushvaqov <akmalxster@gmail.com>\n"
 "Language-Team: Uzbek <uz@li.org>\n"
 "Language: uz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-11-26 11:33+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -36,77 +36,92 @@
 "group_id=64341&atid=507139\n"
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
+"\n"
+"Бахтга қарши  LiVES дастурида носозлик юзага келди.\n"
+"Илтимос, ушбу носозлик ҳақида  http://sourceforge.net/tracker/?"
+"group_id=64341&atid=507139 сайтида маълумот беринг.\n"
+"Раҳмат. Тиклаш жараёни LiVES. дастурини қайтадан ишга туширсангиз мавжуд "
+"бўлиши керак.\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
 "When reporting crashes, please include details of your operating system, "
 "distribution, and the LiVES version ("
 msgstr ""
+"\n"
+"\n"
+"Носозлик ҳақида хабар берганингизда, илтимос, операцион тизимингиз, "
+"дистрибутивингиз ва LiVES дастури версияси маълумотларини ҳам қўшинг ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
+"ва бошқа маълумот қуйида кўрсатилади:\n"
+"\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
+"Илтимос,  gdb'ни ўрнатинг ва кўпроқ маълумот йиғиш учун LiVES дастурини  -"
+"debug мосламаси билан ишга туширинг.\n"
+"\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
-msgstr "Хажмимни узгартириш"
+msgstr "Ҳажми ўзгартирилмоқда"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
-msgstr ""
+msgstr "Барча кадрларнинг _ҳажмини ўзгартириш"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
-msgstr "Исталган"
+msgstr "Бошқа"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "Йўқ"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
-msgstr ""
+msgstr "тавсия қилинди"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
-msgstr ""
+msgstr "ўчирилди !"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
-msgstr ""
+msgstr "**Жорий қатлам**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
-msgstr ""
+msgstr "Реал вақт эффект плагинлари юкланмоқда..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
-msgstr ""
+msgstr "Jack аудио сервер ишга туширилмоқда..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
-msgstr ""
+msgstr "Jack транспорт сервери ишга туширилмоқда..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
-msgstr ""
+msgstr "Jack транспорт серверига уланмоқда..."
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -116,268 +131,280 @@
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
+"\n"
+"\n"
+"jackd'ни қўлбола ишга тушириш сўралмоқда. Илтимос, jackd ишлаётганига ишонч "
+"ҳосил қилинг \n"
+"ёки  <jack_opts> қийматини ~/.lives'дан 16га ўзгартиринг\n"
+"ва LiVES дастурини қайтадан ишга туширинг.\n"
+"\n"
+"Муқобил равишда, lives дастурини \"lives -jackopts 16\", билан ишга "
+"туширишга ҳаракат қилинг ёки "
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
-msgstr ""
+msgstr "Аудио сервер пульси ишга туширилмоқда..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
-msgstr ""
+msgstr "mplayer...аниқланди..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
-msgstr ""
+msgstr "mplayer...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
-msgstr ""
+msgstr "конвертлаш...аниқланди..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
-msgstr ""

LiVES-1.4.7.tar.bz2/po/zh_CN.po -> LiVES-1.4.8.tar.bz2/po/zh_CN.po Changed

@@ -8,18 +8,18 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-10-15 10:33-0300\n"
-"PO-Revision-Date: 2011-08-18 11:58+0000\n"
-"Last-Translator: 英华 <wantinghard@gmail.com>\n"
+"POT-Creation-Date: 2011-11-26 09:19-0300\n"
+"PO-Revision-Date: 2011-11-07 16:24+0000\n"
+"Last-Translator: lhquark <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-11-26 11:32+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
 
-#: src/main.c:110
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +28,7 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:132
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +42,7 @@
 "谢。\n"
 "重启 LiVES 之后应该可以恢复。\n"
 
-#: src/main.c:127
+#: src/main.c:133
 msgid ""
 "\n"
 "\n"
@@ -53,7 +53,7 @@
 "\n"
 "报告崩溃时请包括操作系统、发行版及 LiVES 版本信息 ("
 
-#: src/main.c:130
+#: src/main.c:136
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -61,7 +61,7 @@
 "以及下面的信息：\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:140
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -70,55 +70,55 @@
 "请安装 gdb 然后添加 -debug 选项运行 LiVES 以便收集更多信息。\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:148
 msgid "Preserving set.\n"
 msgstr "正在保存场景。\n"
 
-#: src/main.c:489
+#: src/main.c:497
 msgid "Resizing"
 msgstr "正在调整尺寸"
 
-#: src/main.c:496
+#: src/main.c:504
 msgid "_Resize All Frames"
 msgstr "调整所有帧的尺寸(_R)"
 
-#: src/main.c:758
+#: src/main.c:765
 msgid "Any"
 msgstr "任意"
 
-#: src/main.c:759
+#: src/main.c:766
 msgid "None"
 msgstr "无"
 
-#: src/main.c:760
+#: src/main.c:767
 msgid "recommended"
 msgstr "推荐"
 
-#: src/main.c:761
+#: src/main.c:768
 msgid "disabled !"
 msgstr "已禁用 ！"
 
-#: src/main.c:762
+#: src/main.c:769
 msgid "**The current layout**"
 msgstr "**当前的布局**"
 
-#: src/main.c:1201
+#: src/main.c:1219
 msgid "Loading realtime effect plugins..."
 msgstr "正在加载实时效果插件..."
 
-#: src/main.c:1254
+#: src/main.c:1272
 msgid "Starting jack audio server..."
 msgstr "正在启动 jack 音频服务器..."
 
-#: src/main.c:1256
+#: src/main.c:1274
 msgid "Starting jack transport server..."
 msgstr "正在启动 jack 传输服务器..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid "Connecting to jack transport server..."
 msgstr "正在连接 jack 传输服务器..."
 
-#: src/main.c:1284
+#: src/main.c:1302
 msgid ""
 "\n"
 "\n"
@@ -136,95 +136,95 @@
 "\n"
 "或者，尝试通过“lives -jackopts 16”或以下方式启动 lives "
 
-#: src/main.c:1308
+#: src/main.c:1326
 msgid "Starting pulse audio server..."
 msgstr "正在开启 pulse 音频服务..."
 
-#: src/main.c:1371
+#: src/main.c:1389
 msgid "Checking optional dependencies:"
 msgstr "检查可选的依赖："
 
-#: src/main.c:1372
+#: src/main.c:1390
 msgid "mplayer...detected..."
 msgstr "mplayer...发现..."
 
-#: src/main.c:1373
+#: src/main.c:1391
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...未发现..."
 
-#: src/main.c:1374
+#: src/main.c:1392
 msgid "convert...detected..."
 msgstr "convert...发现..."
 
-#: src/main.c:1375
+#: src/main.c:1393
 msgid "convert...NOT DETECTED..."
 msgstr "convert...未发现..."
 
-#: src/main.c:1376
+#: src/main.c:1394
 msgid "composite...detected..."
 msgstr "composite...发现..."
 
-#: src/main.c:1377
+#: src/main.c:1395
 msgid "composite...NOT DETECTED..."
 msgstr "composite...未发现..."
 
-#: src/main.c:1378
+#: src/main.c:1396
 msgid "sox...detected\n"
 msgstr "sox...发现\n"
 
-#: src/main.c:1379
+#: src/main.c:1397
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...未发现\n"
 
-#: src/main.c:1380
+#: src/main.c:1398
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...发现..."
 
-#: src/main.c:1381
+#: src/main.c:1399
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...未发现..."
 
-#: src/main.c:1382
+#: src/main.c:1400
 msgid "jackd...detected..."
 msgstr "jackd...发现..."
 
-#: src/main.c:1383

LiVES-1.4.7.tar.bz2/resources/Makefile.in -> LiVES-1.4.8.tar.bz2/resources/Makefile.in Changed

@@ -118,6 +118,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -171,6 +172,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -184,6 +187,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -212,6 +216,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -258,6 +264,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -291,7 +298,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

LiVES-1.4.7.tar.bz2/smogrify -> LiVES-1.4.8.tar.bz2/smogrify Changed

@@ -32,7 +32,7 @@
 # Do not change these except for testing !
 
 $background=1;
-$version="1.4.7";
+$version="1.4.8";
 #$dyneversion="LIVES-20091209";
 
 
@@ -287,7 +287,7 @@
 	&rc_set_if_not_set("mt_def_signed_endian",2*!&get_endian);
 	&rc_set_if_not_set("mt_backaudio","1");
 	&rc_set_if_not_set("mt_pertrack_audio","true");
-	&rc_set_if_not_set("mt_auto_back",30);
+	&rc_set_if_not_set("mt_auto_back",120);
 
 	&rc_set_if_not_set("ar_clipset","");
 	&rc_set_if_not_set("ar_layout","");
@@ -617,7 +617,6 @@
     if ($command eq "list_plugins") {
 	# prefix_dir pref should be set first
 	# plugins are returned in sort() order
-
 	my $allow_nonex=$ARGV[1];
 	my $allow_subdirs=$ARGV[2];
 	my $plugindir=$ARGV[3];
@@ -1903,20 +1902,51 @@
 	    chdir $curtmpdir;
 	    $end=$ARGV[2];
 
-	    my $width=$ARGV[3];
-	    my $height=$ARGV[4];
+	    my $iwidth=$ARGV[3];
+	    my $iheight=$ARGV[4];
 
 	    $img_ext=".".$ARGV[5];
 
 	    $resize_ext=".mgk";
 
+	    my $letterbox=0;
+
+	    if (defined($ARGV[6]) && $ARGV[6]>0) {
+		# letterboxen - next values are image-in-frame size
+		$letterbox=1;
+		$owidth=$iwidth;
+		$oheight=$iheight;
+		$iwidth=$ARGV[6];
+		$iheight=$ARGV[7];
+		$in_ext=$resize_ext;
+		$out_ext=$img_ext;
+	    }
+
+	    &clean_old;
+
 	    for ($i=1;$i<=$end;$i++) {
 		$name=&mkname($i);
-		&resize_frame($name,$width,$height);
+		
+		`/bin/cp -f $name$img_ext $name.bak`;
+
+		if ($iwidth>0 && $iheight>0) {
+		    &resize_frame($name,$iwidth,$iheight);
+		}
+
+		if ($letterbox) {
+		    &letterbox_frame($name,abs($iwidth),abs($iheight),$owidth,$oheight);
+		}
+
 		&sig_progress($i);
 	    }
+
+
 	    $start=1;
-	    &mv_mgk;
+
+	    unless ($letterbox) {
+		&mv_mgk;
+	    }
+
 	    &sig_complete;
 	    exit 0;
 	}
@@ -2053,6 +2083,20 @@
 	    $old_end=$ARGV[7];
 	}
 
+	$letterbox=0;
+
+	if (defined $ARGV[8] && $ARGV[8]!=0) {
+	    #letterbox size
+	    $letterbox=1;
+	    $owidth=$newwidth;
+	    $oheight=$newheight;
+
+	    $newwidth=$ARGV[8];
+	    $newheight=$ARGV[9];
+	    $in_ext=".mgk";
+	    $out_ext=$img_ext;
+	}
+
 	$newframe=-1;
 	$event_file="$curtmpdir/event.frames";
 	$resize_ext=".tmp";
@@ -2076,19 +2120,34 @@
 		    if (-f "$curtmpdir/$from$img_ext") {
 			$to=&mkname($count);
 
-			if (defined $newwidth && defined $newheight && $newwidth*$newheight > 0) {
+			if ($newwidth > 0 && $newheight > 0) {
 			    &resize_frame($from,$newwidth,$newheight);
-			    unlink "$to.mgk";
-			    rename "$from$resize_ext","$to.mgk";
+			    `/bin/mv -f $from$resize_ext $to.mgk`;
 			}
 			else {
-			    # we don't preview here...
-			    unless ($from eq $to) {
-				`/bin/cp $from$img_ext $to.mgk`;
+			    unless (($from eq $to) || $letterbox) {
+				`/bin/cp -f $from$img_ext $to.mgk`;
 			    }
 			}
-		    }
 
+#now resized are in .mgk
+			if ($letterbox) {
+			    if ($leave_bak) {
+				#letterboxing was done with resize
+				unless ($from eq $to) {
+				    `/bin/cp -f $from$img_ext $to$img_ext.2`;
+				    `/bin/cp -f $from.mgk $to.mgk.2`;
+				}
+			    }
+			    else {
+				`/bin/cp -f $to$img_ext $to.bak`;
+				# make $to.mgk $to.img_ext
+				&letterbox_frame($to,abs($newwidth),abs($newheight),$owidth,$oheight);
+			    }
+#lb are in .img
+			}
+
+		    }
 		    $count++;
 		}
 		&sig_progress($fcount++);
@@ -2104,9 +2163,34 @@
 	$new_count=--$count;
 	$end=$count;
 
-	&mv_mgk;
+	unless ($letterbox) {
+	    # mv mgk -> $img_ext
+	    &mv_mgk;
+	}
+
+	if ($letterbox&&$leave_back) {
+	    # because of potential ovewrite we made .mgk2 (resized/no letterbox) and $img_ext.2 (resized)
+	    # now copy these
+	    unless (!defined($statusfile)||$statusfile eq "") {
+		# don't want to get killed in this stage...
+		unlink $statusfile;
+	    }
+	    
+	    for ($i=$start;$i<=$end;$i++) {
+		$name=&mkname($i);
+		if (-f "$curtmpdir/$name.mgk.2") {
+		    if (-f "$curtmpdir/$name$img_ext.2") {
+			unlink "$curtmpdir/$name$img_ext";
+			rename "$curtmpdir/$name.img_ext.2","$curtmpdir/$name$img_ext";
+		    }
+		    unlink "$curtmpdir/$name.mgk";
+		    rename "$curtmpdir/$name.mgk.2","$curtmpdir/$name.mgk";
+		}
+	    }
+	}
 
 	if ($end<$old_end) {
+	    # remove excess frames
 	    for ($i=$end+1;$i<=$old_end;$i++) {
 		$name=&mkname($i);
 		if (-f "$curtmpdir/$name$img_ext") {
@@ -2281,6 +2365,10 @@
 	    $start=$ARGV[2];
 	    $end=$ARGV[3];
 	    $img_ext=".".$ARGV[4];
+	    if (defined($ARGV[5])) {
+		$leave_bak=$ARGV[5];
+	    }
+
 	    &mv_mgk;
 	    &sig_complete;
 	    exit 0;
@@ -2374,23 +2462,29 @@
 
 	# resample $audio_out (if required)
 	unless ($arate==$nrate&&$achans==$nchans&&$asamps==$nsamps&&$nsigned==$signed&&$nendian==$endian) {
-	    $audio_in=$audio_out;
-	    $audio_out=$audio_bak;
-	    &resample_audio;
-	    unlink $audio_in;

LiVES-1.4.7.tar.bz2/src/Makefile.am -> LiVES-1.4.8.tar.bz2/src/Makefile.am Changed

@@ -121,6 +121,16 @@
 gtk_def += -DHAVE_GTK_VERSION216=1
 endif
 
+if HAVE_LIBPNG
+png_LDADD=@PNG_LIBS@
+png_CFLAGS=@PNG_CFLAGS@ -DUSE_LIBPNG=1
+endif
+
+if HAVE_SWSCALE
+swscale_LDADD=@LIBSWSCALE_LIBS@
+swscale_CFLAGS=@LIBSWSCALE_CFLAGS@ -DUSE_SWSCALE=1
+endif
+
 
 if ENABLE_GIW
 giw_SOURCES=giw/giwknob.c giw/giwknob.h giw/giwvslider.c giw/giwvslider.h giw/giwled.c giw/giwled.h
@@ -170,11 +180,11 @@
 	$(giw_SOURCES)
 
 lives_exe_LDADD = @GTK_LIBS_NODYNAMIC@ @X11_LIBS@ @MJPEGTOOLS_LIBS@ $(osc_LDADD) $(jack_LDADD) $(ldvgrab_LDADD) \
-	$(oil_LDADD) $(alsa_LDADD) $(pulse_LDADD) -lpthread $(libweed_LDADD) $(giw_LDADD) $(v4l1_LDADD) \
+	$(oil_LDADD) $(alsa_LDADD) $(pulse_LDADD) $(png_LDADD) $(swscale_LDADD) -lpthread $(libweed_LDADD) $(giw_LDADD) $(v4l1_LDADD) \
 	@UNICAP_LIBS@
 
 AM_CFLAGS = -Wstrict-aliasing=0 $(yuv4mpeg_CFLAGS) $(ldvgrab_CFLAGS) $(dvgrab_CFLAGS) $(oil_CFLAGS) \
-	$(darwin_CFLAGS) $(irix_CFLAGS) $(linux_CFLAGS) $(solaris_CFLAGS) $(osc_CFLAGS) $(alsa_CFLAGS) \
+	$(darwin_CFLAGS) $(irix_CFLAGS) $(linux_CFLAGS) $(solaris_CFLAGS) $(osc_CFLAGS) $(alsa_CFLAGS) $(png_CFLAGS) $(swscale_CFLAGS) \
 	$(jack_CFLAGS) $(pulse_CFLAGS) $(giw_CFLAGS) $(unicap_CFLAGS) $(libweed_CFLAGS) \
 	-DLIVES_LIBDIR=\""$(libdir)"\" $(gtk_def)

LiVES-1.4.7.tar.bz2/src/Makefile.in -> LiVES-1.4.8.tar.bz2/src/Makefile.in Changed

@@ -118,6 +118,7 @@
 lives_exe_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -164,6 +165,7 @@
 DEPDIR = @DEPDIR@
 DIRAC_CFLAGS = @DIRAC_CFLAGS@
 DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -217,6 +219,8 @@
 LIBPTH = @LIBPTH@
 LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -230,6 +234,7 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
 MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
 MKDIR_P = @MKDIR_P@
@@ -258,6 +263,8 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTHREAD_CC = @PTHREAD_CC@
@@ -304,6 +311,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
@@ -337,7 +345,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -403,6 +410,10 @@
 @HAVE_PULSE_AUDIO_TRUE@pulse_LDADD = @PULSE_LIBS@
 @HAVE_PULSE_AUDIO_TRUE@pulse_CFLAGS = @PULSE_LIBS@ -DHAVE_PULSE_AUDIO=1
 @HAVE_PULSE_AUDIO_TRUE@pulse_SOURCES = pulse.c pulse.h
+@HAVE_LIBPNG_TRUE@png_LDADD = @PNG_LIBS@
+@HAVE_LIBPNG_TRUE@png_CFLAGS = @PNG_CFLAGS@ -DUSE_LIBPNG=1
+@HAVE_SWSCALE_TRUE@swscale_LDADD = @LIBSWSCALE_LIBS@
+@HAVE_SWSCALE_TRUE@swscale_CFLAGS = @LIBSWSCALE_CFLAGS@ -DUSE_SWSCALE=1
 @ENABLE_GIW_TRUE@giw_SOURCES = giw/giwknob.c giw/giwknob.h giw/giwvslider.c giw/giwvslider.h giw/giwled.c giw/giwled.h
 @ENABLE_GIW_TRUE@giw_LDADD = -lm
 @ENABLE_GIW_TRUE@giw_CFLAGS = -DENABLE_GIW=1
@@ -447,11 +458,11 @@
 	$(giw_SOURCES)
 
 lives_exe_LDADD = @GTK_LIBS_NODYNAMIC@ @X11_LIBS@ @MJPEGTOOLS_LIBS@ $(osc_LDADD) $(jack_LDADD) $(ldvgrab_LDADD) \
-	$(oil_LDADD) $(alsa_LDADD) $(pulse_LDADD) -lpthread $(libweed_LDADD) $(giw_LDADD) $(v4l1_LDADD) \
+	$(oil_LDADD) $(alsa_LDADD) $(pulse_LDADD) $(png_LDADD) $(swscale_LDADD) -lpthread $(libweed_LDADD) $(giw_LDADD) $(v4l1_LDADD) \
 	@UNICAP_LIBS@
 
 AM_CFLAGS = -Wstrict-aliasing=0 $(yuv4mpeg_CFLAGS) $(ldvgrab_CFLAGS) $(dvgrab_CFLAGS) $(oil_CFLAGS) \
-	$(darwin_CFLAGS) $(irix_CFLAGS) $(linux_CFLAGS) $(solaris_CFLAGS) $(osc_CFLAGS) $(alsa_CFLAGS) \
+	$(darwin_CFLAGS) $(irix_CFLAGS) $(linux_CFLAGS) $(solaris_CFLAGS) $(osc_CFLAGS) $(alsa_CFLAGS) $(png_CFLAGS) $(swscale_CFLAGS) \
 	$(jack_CFLAGS) $(pulse_CFLAGS) $(giw_CFLAGS) $(unicap_CFLAGS) $(libweed_CFLAGS) \
 	-DLIVES_LIBDIR=\""$(libdir)"\" $(gtk_def)

LiVES-1.4.7.tar.bz2/src/audio.c -> LiVES-1.4.8.tar.bz2/src/audio.c Changed

@@ -963,7 +963,6 @@
       if (zavel<0.) lseek64(in_fd[track],seekstart[track]-tbytes,SEEK_SET);
 
       bytes_read=read(in_fd[track],in_buff,tbytes);
-      //g_print("read %ld bytes\n",bytes_read);
 
       if (zavel<0.) seekstart[track]-=bytes_read;
 
@@ -1010,7 +1009,7 @@
       if (mainw->multitrack!=NULL) {
 	// we work out the "visibility" of each track at tc
 	gdouble *vis=get_track_visibility_at_tc(mainw->multitrack->event_list,nfiles,mainw->multitrack->opts.back_audio_tracks,tc,&shortcut,mainw->multitrack->opts.audio_bleedthru);
-	
+
 	// locate the master volume parameter, and multiply all values by vis[track]
 	weed_apply_audio_effects(mainw->filter_map,chunk_float_buffer,mainw->multitrack->opts.back_audio_tracks,out_achans,blocksize,out_arate,tc,vis);
 	
@@ -1039,7 +1038,7 @@
 
       if (mainw->multitrack==NULL) {
 	time+=(gdouble)frames_out/(gdouble)out_arate;
-	opvol=opvol_start+(opvol_end-opvol_start)*(time/((tc_end-tc_start)/U_SEC));
+	opvol=opvol_start+(opvol_end-opvol_start)*(time/(gdouble)((tc_end-tc_start)/U_SEC));
       }
       else tc+=(gdouble)blocksize/(gdouble)out_arate*U_SEC;
     }
@@ -1614,6 +1613,7 @@
       g_free(mainw->pulsed->abufs[i]);
     }
   }
+  g_free(mainw->pulsed->abufs);
 #endif
 }
 
@@ -2045,10 +2045,6 @@
   gchar *astname=g_strdup_printf("livesaudio-%d.pcm",getpid());
   gchar *astname_out=g_strdup_printf("livesaudio-%d.stream",getpid());
 
-  gchar *astreamer;
-
-  gchar *com;
-
   int arate=0;
 
   int afd;
@@ -2076,15 +2072,17 @@
 #endif
     }
 
-    astreamer=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_AUDIO_STREAM,playername,NULL);
-    com=g_strdup_printf("%s play %d \"%s\" \"%s\" %d",astreamer,mainw->vpp->audio_codec,astream_name,astream_name_out,arate);
 
   astream_pid=fork();
 
   if (!astream_pid) {
     // mkfifo and play until killed
+    gchar *astreamer=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_AUDIO_STREAM,playername,NULL);
+    gchar *com=g_strdup_printf("%s play %d \"%s\" \"%s\" %d",astreamer,mainw->vpp->audio_codec,astream_name,astream_name_out,arate);
     
     setsid(); // create new session id
+
+    g_free(astreamer);
     
     // block here until killed
 
@@ -2112,8 +2110,6 @@
 #endif
   }
 
-  g_free(astreamer);
-  g_free(com);
   g_free(astream_name);
   g_free(astream_name_out);
 
@@ -2142,13 +2138,13 @@
 
     if (prefs->audio_player==AUD_PLAYER_PULSE) {
 #ifdef HAVE_PULSE_AUDIO
-      close(mainw->pulsed->astream_fd);
+      if (mainw->pulsed->astream_fd>-1) close(mainw->pulsed->astream_fd);
       mainw->pulsed->astream_fd=-1;
 #endif
     }
     if (prefs->audio_player==AUD_PLAYER_JACK) {
 #ifdef ENABLE_JACK
-      close(mainw->jackd->astream_fd);
+      if (mainw->jackd->astream_fd>-1) close(mainw->jackd->astream_fd);
       mainw->jackd->astream_fd=-1;
 #endif
     }

LiVES-1.4.7.tar.bz2/src/callbacks.c -> LiVES-1.4.8.tar.bz2/src/callbacks.c Changed

@@ -62,6 +62,7 @@
 
     if (mainw->multitrack!=NULL&&!mainw->only_close) {
        if (mainw->multitrack->undo_mem!=NULL) g_free(mainw->multitrack->undo_mem);
+       mainw->multitrack->undo_mem=NULL;
     }
 
     if (mainw->playing_file>-1) {
@@ -90,7 +91,7 @@
       }
     }
     
-    // prevent crash in threaded dialog
+    // prevent crash in "threaded" dialog
     mainw->current_file=-1;
 
     if (!mainw->only_close) {
@@ -211,7 +212,6 @@
 	dummyvar=system(com);
 	threaded_dialog_spin();
 	g_free(com);
-	threaded_dialog_spin();
       }
       else {
 	com=g_strdup_printf("/bin/rm -r %s/%s/clips 2>/dev/null",prefs->tmpdir,mainw->set_name);
@@ -260,8 +260,6 @@
 	}
 
 	cfile->layout_map=NULL;
-
-	threaded_dialog_spin();
       }
     }
 
@@ -287,7 +285,6 @@
       if (mainw->current_file>-1) sensitize();
       gtk_widget_queue_draw(mainw->LiVES);
       d_print_done();
-      threaded_dialog_spin();
       end_threaded_dialog();
 
       if (mainw->multitrack!=NULL) {
@@ -302,6 +299,12 @@
     }
 
     save_future_prefs();
+
+    // stop valgrind from complaining
+    if (mainw->preview_image!=NULL) gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->preview_image), NULL);
+    if (mainw->image272!=NULL) gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image272), NULL);
+    if (mainw->image273!=NULL) gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image273), NULL);
+
     if (mainw->sep_win&&(mainw->playing_file>-1||prefs->sepwin_type==1)) {
       threaded_dialog_spin();
       kill_play_window();
@@ -310,10 +313,8 @@
   }
 
   if (mainw->current_layouts_map!=NULL) {
-    threaded_dialog_spin();
     g_list_free_strings(mainw->current_layouts_map);
     g_list_free(mainw->current_layouts_map);
-    threaded_dialog_spin();
     mainw->current_layouts_map=NULL;
   }
 
@@ -321,8 +322,10 @@
     if (capable->has_encoder_plugins) plugin_request("encoders",prefs->encoder.name,"finalise");
 
     weed_unload_all();
+    threaded_dialog_spin();
 
     rfx_free_all();
+    threaded_dialog_spin();
 
 #ifdef ENABLE_OSC
     if (prefs->osc_udp_started) lives_osc_end();
@@ -330,17 +333,14 @@
   }
 
   if (mainw->multitrack!=NULL) {
-    threaded_dialog_spin();
     event_list_free_undos(mainw->multitrack);
     
     if (mainw->multitrack->event_list!=NULL) {
       event_list_free(mainw->multitrack->event_list);
       mainw->multitrack->event_list=NULL;
     }
-    threaded_dialog_spin();
   }
 
-  threaded_dialog_spin();
   if (prefs->fxdefsfile!=NULL) g_free(prefs->fxdefsfile);
   if (prefs->fxsizesfile!=NULL) g_free(prefs->fxsizesfile);
   g_free(mainw->recovery_file);
@@ -351,12 +351,11 @@
   g_free(mainw->recommended_string);
   g_free(mainw->cl_string);
 
-  if (mainw->mgeom!=NULL) g_free(mainw->mgeom);
-  threaded_dialog_spin();
-  //end_threaded_dialog(); - gtk+ hangs, just let it die
-
   unload_decoder_plugins();
 
+  end_threaded_dialog();
+  if (mainw->mgeom!=NULL) g_free(mainw->mgeom);
+
   if (prefs->disabled_decoders!=NULL) {
     g_list_free_strings(prefs->disabled_decoders);
     g_list_free(prefs->disabled_decoders);
@@ -364,6 +363,10 @@
 
   if (mainw->fonts_array!=NULL) g_strfreev(mainw->fonts_array);
 
+#ifdef USE_SWSCALE
+  sws_free_context();
+#endif
+
 #ifdef ENABLE_NLS
   if (trString!=NULL) g_free(trString);
 #endif
@@ -378,6 +381,7 @@
 			      GdkEvent        *event,
 		      	      gpointer         user_data)
 {
+  // event callback that just returns TRUE
   return TRUE;
 }
 
@@ -428,7 +432,7 @@
   gchar *dirname;
   gchar *fname=g_strdup(gtk_entry_get_text(entry));
   while (g_main_context_iteration(NULL,FALSE));
-  dirname=choose_file(fname,NULL,NULL,GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,NULL);
+  dirname=choose_file(fname,NULL,NULL,GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,NULL,NULL);
   if (dirname!=NULL) {
     g_snprintf(file_name,256,"%s",dirname);
     g_free(dirname);
@@ -445,6 +449,10 @@
 on_open_activate                      (GtkMenuItem     *menuitem,
 				       gpointer         user_data)
 {
+
+  // OPEN A FILE
+
+
   GtkWidget *fileselection;
 
   if (mainw->multitrack!=NULL) {
@@ -692,40 +700,19 @@
 
 void
 on_save_as_activate (GtkMenuItem *menuitem, gpointer user_data) {
-  GtkWidget *fileselection;
 
   if (cfile->frames==0) {
     on_export_audio_activate (NULL,NULL);
     return;
   }
 
-  while (g_main_context_iteration(NULL,FALSE));
-
-  mainw->save_all=TRUE;
-  fileselection = create_fileselection (_ ("Select File"),3,NULL);
-
-  if (strlen(mainw->vid_save_dir)) {
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection), mainw->vid_save_dir);
-  }
-  g_signal_connect (GTK_FILE_SELECTION(fileselection)->ok_button, "clicked",G_CALLBACK (on_ok_button3_clicked),NULL);
-  gtk_widget_show (fileselection);
+  save_file(mainw->current_file,1,cfile->frames,NULL);
 }
 
 
 void
 on_save_selection_activate (GtkMenuItem *menuitem, gpointer user_data) {
-  GtkWidget *fileselection;
-
-  while (g_main_context_iteration(NULL,FALSE));
-
-  mainw->save_all=FALSE;
-
-  fileselection = create_fileselection ("Select File",3,NULL);
-  if (strlen(mainw->vid_save_dir)) {
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection), mainw->vid_save_dir);
-  }
-  g_signal_connect (GTK_FILE_SELECTION(fileselection)->ok_button, "clicked",G_CALLBACK (on_ok_button3_clicked),NULL);
-  gtk_widget_show (fileselection);
+  save_file(mainw->current_file,cfile->start,cfile->end,NULL);
 }
 
 
@@ -886,7 +873,7 @@
 {
   gchar *com;
   gchar *filt[]={"*.lv2",NULL};
-  gchar *proj_file=choose_file(NULL,NULL,filt,GTK_FILE_CHOOSER_ACTION_OPEN,NULL);
+  gchar *proj_file=choose_file(NULL,NULL,filt,GTK_FILE_CHOOSER_ACTION_OPEN,NULL,NULL);
   gchar *info_file;

LiVES-1.4.7.tar.bz2/src/callbacks.h -> LiVES-1.4.8.tar.bz2/src/callbacks.h Changed

LiVES-1.4.7.tar.bz2/src/colourspace.c -> LiVES-1.4.8.tar.bz2/src/colourspace.c Changed

@@ -1,6 +1,6 @@
 // colourspace.h
 // LiVES
-// (c) G. Finch 2004 - 2010 <salsaman@xs4all.nl>
+// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl>
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -32,21 +32,66 @@
 
 #include <math.h>
 
+#ifdef USE_SWSCALE
+#include <libswscale/swscale.h>
+
+// for libweed-compat.h
+#define HAVE_AVCODEC
+#endif // USE_SWSCALE
+
 #ifdef HAVE_SYSTEM_WEED
 #include "weed/weed.h"
 #include "weed/weed-palettes.h"
 #include "weed/weed-effects.h"
 #include "weed/weed-host.h"
+
+#ifdef USE_SWSCALE
+
+#ifdef HAVE_SYSTEM_WEED_COMPAT
+#include "weed/weed-compat.h"
 #else
+#include "../libweed/weed-compat.h"
+#endif // HAVE_SYSTEM_WEED_COMPAT
+
+#endif // USE_SWSCALE
+
+#else // HAVE_SYSTEM_WEED
 #include "../libweed/weed.h"
 #include "../libweed/weed-palettes.h"
 #include "../libweed/weed-effects.h"
 #include "../libweed/weed-host.h"
-#endif
+
+#ifdef USE_SWSCALE
+#include "../libweed/weed-compat.h"
+#endif // USE_SWSCALE
+
+#endif // HAVE_SYSTEM_WEED
 
 #include "support.h"
 #include "main.h"
 
+#ifdef USE_SWSCALE
+#define N_SWS_CTX 16
+
+gboolean swscale_ctx_list_inited=FALSE;
+
+struct _swscale_ctx {
+  int iwidth;
+  int iheight;
+  int width;
+  int height;
+  int pixfmt;
+  int flags;
+  struct SwsContext *ctx;
+};
+
+static struct _swscale_ctx swscale_ctx[N_SWS_CTX];
+
+#endif // USE_SWSCALE
+
+#define USE_THREADS 1
+
+static pthread_t cthreads[MAX_FX_THREADS];
 
 inline G_GNUC_CONST int gdk_rowstride_value (int rowstride) {
   // from gdk-pixbuf.c
@@ -1173,16 +1218,17 @@
 ///////////////////////////////////////////////////////////
 // frame conversions
 
-static void convert_yuv888_to_rgb_frame(guchar *src, gint hsize, gint vsize, gint orowstride, guchar *dest, gboolean add_alpha, gboolean clamped) {
+static void convert_yuv888_to_rgb_frame(guchar *src, gint hsize, gint vsize, gint irowstride, gint orowstride, guchar *dest, gboolean add_alpha, gboolean clamped) {
   register int x,y;
-  size_t offs=3,ohs;
+  size_t offs=3;
   
   if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
   if (add_alpha) offs=4;
-  ohs=orowstride-offs*hsize;
+  orowstride-=offs*hsize;
+  irowstride-=hsize*3;
 
   for (y=0;y<vsize;y++) {
     for (x=0;x<hsize;x++) {
@@ -1190,22 +1236,24 @@
       src+=3;
       dest+=offs;
     }
-    dest+=ohs;
+    dest+=orowstride;
+    src+=irowstride;
   }
 }
 
 
-static void convert_yuva8888_to_rgba_frame(guchar *src, gint hsize, gint vsize, gint orowstride, guchar *dest, gboolean del_alpha, gboolean clamped) {
+static void convert_yuva8888_to_rgba_frame(guchar *src, gint hsize, gint vsize, gint irowstride, gint orowstride, guchar *dest, gboolean del_alpha, gboolean clamped) {
   register int x,y;
 
-  size_t offs=4,ohs;
+  size_t offs=4;
   
   if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
   if (del_alpha) offs=3;
-  ohs=orowstride-offs*hsize;
+  orowstride-=offs*hsize;
+  irowstride-=hsize*4;
 
   for (y=0;y<vsize;y++) {
     for (x=0;x<hsize;x++) {
@@ -1213,20 +1261,22 @@
       src+=4;
       dest+=offs;
     }
-    dest+=ohs;
+    dest+=orowstride;
+    src+=irowstride;
   }
 }
 
-static void convert_yuv888_to_bgr_frame(guchar *src, gint hsize, gint vsize, gint orowstride, guchar *dest, gboolean add_alpha, gboolean clamped) {
+static void convert_yuv888_to_bgr_frame(guchar *src, gint hsize, gint vsize, gint irowstride, gint orowstride, guchar *dest, gboolean add_alpha, gboolean clamped) {
   register int x,y;
-  size_t offs=3,ohs;
+  size_t offs=3;
   
   if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
   if (add_alpha) offs=4;
-  ohs=orowstride-offs*hsize;
+  orowstride-=offs*hsize;
+  irowstride-=hsize*3;
 
   for (y=0;y<vsize;y++) {
     for (x=0;x<hsize;x++) {
@@ -1234,22 +1284,25 @@
       src+=3;
       dest+=offs;
     }
-    dest+=ohs;
+    dest+=orowstride;
+    src+=irowstride;
   }
+
 }
 
 
-static void convert_yuva8888_to_bgra_frame(guchar *src, gint hsize, gint vsize, gint orowstride, guchar *dest, gboolean del_alpha, gboolean clamped) {
+static void convert_yuva8888_to_bgra_frame(guchar *src, gint hsize, gint vsize, gint irowstride, gint orowstride, guchar *dest, gboolean del_alpha, gboolean clamped) {
   register int x,y;
 
-  size_t offs=4,ohs;
+  size_t offs=4;
   
   if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
   if (del_alpha) offs=3;
-  ohs=orowstride-offs*hsize;
+  orowstride-=offs*hsize;
+  irowstride-=4*hsize;
 
   for (y=0;y<vsize;y++) {
     for (x=0;x<hsize;x++) {
@@ -1257,7 +1310,8 @@
       src+=4;
       dest+=offs;
     }
-    dest+=ohs;
+    dest+=orowstride;
+    src+=irowstride;
   }
 }
 
@@ -1424,16 +1478,62 @@
 }
 
 
-void convert_rgb_to_uyvy_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, uyvy_macropixel *u, gboolean has_alpha, gboolean clamped) {
+void convert_rgb_to_uyvy_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, uyvy_macropixel *u, gboolean has_alpha, gboolean clamped, int thread_id) {
   // for odd sized widths, cut the rightmost pixel

LiVES-1.4.7.tar.bz2/src/colourspace.h -> LiVES-1.4.8.tar.bz2/src/colourspace.h Changed

@@ -31,13 +31,70 @@
 } yuv411_macropixel;
 
 
+
+
+typedef struct {
+  void *src;
+  gint hsize;
+  gint vsize;
+  gint irowstrides[4];
+  gint orowstrides[4];
+  void *dest;
+  gboolean in_alpha;
+  gboolean out_alpha;
+  gboolean in_clamped;
+  gboolean out_clamped;
+  int in_subspace;
+  int out_subspace;
+  int in_sampling;
+  int out_sampling;
+  gboolean alpha_first;
+  int thread_id;
+} lives_cc_params;
+
+
+// internal thread fns - data points to a lives_cc_params struct
+void *convert_rgb_to_uyvy_frame_thread(void *data);
+void *convert_bgr_to_uyvy_frame_thread(void *data);
+void *convert_rgb_to_yuyv_frame_thread(void *data);
+void *convert_bgr_to_yuyv_frame_thread(void *data);
+
+void *convert_rgb_to_yuv_frame_thread(void *data);
+void *convert_bgr_to_yuv_frame_thread(void *data);
+
+void *convert_uyvy_to_rgb_frame_thread(void *data);
+void *convert_uyvy_to_bgr_frame_thread(void *data);
+void *convert_yuyv_to_rgb_frame_thread(void *data);
+void *convert_yuyv_to_bgr_frame_thread(void *data);
+
+
+void *convert_swap3_frame_thread(void *data);
+void *convert_swap4_frame_thread(void *data);
+void *convert_swap3addpost_frame_thread(void *data);
+void *convert_swap3addpre_frame_thread(void *data);
+void *convert_swap3delpost_frame_thread(void *data);
+void *convert_swap3delpre_frame_thread(void *data);
+void *convert_addpre_frame_thread(void *data);
+void *convert_addpost_frame_thread(void *data);
+void *convert_delpre_frame_thread(void *data);
+void *convert_delpost_frame_thread(void *data);
+void *convert_swap3postalpha_frame_thread(void *data);
+void *convert_swapprepost_frame_thread(void *data);
+
+void *convert_swab_frame_thread(void *data);
+
+
+
 ///////////////////////////////////////
 // these functions should be used in future
 gboolean convert_layer_palette(weed_plant_t *layer, int outpl, int op_clamping);
 gboolean convert_layer_palette_with_sampling(weed_plant_t *layer, int outpl, int out_sampling);
+gboolean convert_layer_palette_full(weed_plant_t *layer, int outpl, int osamtype, gboolean oclamping, int osubspace);
 gboolean apply_gamma (weed_plant_t *ilayer, weed_plant_t *olayer, double gamma); ///< not used
 void resize_layer (weed_plant_t *layer, int width, int height, int interp);
-void create_empty_pixel_data(weed_plant_t *layer);
+void letterbox_layer (weed_plant_t *layer, int width, int height, int nwidth, int nheight);
+void compact_rowstrides(weed_plant_t *layer);
+void create_empty_pixel_data(weed_plant_t *layer, gboolean black_fill);
 void pixel_data_planar_from_membuf(void **pixel_data, void *data, size_t size, int palette);
 GdkPixbuf *layer_to_pixbuf (weed_plant_t *layer);
 gboolean pixbuf_to_layer(weed_plant_t *layer, GdkPixbuf *);
@@ -77,3 +134,7 @@
 const char *weed_yuv_subspace_get_name(int subspace);
 gchar *weed_palette_get_name_full(int pal, int clamped, int subspace);
 
+
+#ifdef USE_SWSCALE
+void sws_free_context(void);
+#endif

LiVES-1.4.7.tar.bz2/src/cvirtual.c -> LiVES-1.4.8.tar.bz2/src/cvirtual.c Changed

LiVES-1.4.7.tar.bz2/src/cvirtual.h -> LiVES-1.4.8.tar.bz2/src/cvirtual.h Changed

LiVES-1.4.7.tar.bz2/src/dialogs.c -> LiVES-1.4.8.tar.bz2/src/dialogs.c Changed

@@ -29,7 +29,6 @@
 static gboolean accelerators_swapped;
 static gint frames_done;
 static gint disp_frames_done;
-static gint64 last_display_ticks=0;  // ticks when last display happened (fixed)
 
 static gint64 last_open_check_ticks;
 
@@ -65,13 +64,6 @@
 
 }
 
-static int progress_count;
-
-
-#define PROG_LOOP_VAL 50
-
-
-
 
 
 static void add_xlays_widget(GtkBox *box) {
@@ -178,7 +170,7 @@
   }
 
   if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(dialog2),FALSE);
+    //gtk_dialog_set_has_separator(GTK_DIALOG(dialog2),FALSE);
     gtk_widget_modify_bg(dialog2, GTK_STATE_NORMAL, &palette->normal_back);
   }
 
@@ -376,6 +368,8 @@
   GtkTextMark *mark;
   GtkTextBuffer *optextbuf=gtk_text_view_get_buffer(mainw->optextview);
 
+  if (!iochan->is_readable) return;
+
   g_io_channel_read_to_end(iochan,&str_return,&retlen,&gerr);
 
   if (gerr!=NULL) g_error_free(gerr);
@@ -448,6 +442,37 @@
 }
 
 
+
+static int progress_count;
+
+#define PROG_LOOP_VAL 50
+
+static void progbar_pulse_or_fraction(file *sfile, int frames_done) {
+  gdouble timesofar;
+
+  if (progress_count++>=PROG_LOOP_VAL) {
+    if (frames_done<=sfile->progress_end&&sfile->progress_end>0&&!mainw->effects_paused&&
+	frames_done>0) {
+      
+      gettimeofday(&tv, NULL);
+      mainw->currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
+      timesofar=(mainw->currticks-mainw->timeout_ticks)/U_SEC;
+      
+      disp_fraction(frames_done,sfile->progress_start,sfile->progress_end,
+		    timesofar,sfile->proc_ptr);
+      progress_count=0;
+    }
+    else {
+      gtk_progress_bar_pulse(GTK_PROGRESS_BAR(sfile->proc_ptr->progressbar));
+      progress_count=0;
+    }
+  }
+}
+
+
+
+
+
 gboolean process_one (gboolean visible) {
   gint64 new_ticks;
 
@@ -625,13 +650,18 @@
       // for realtime players, we did this in calc_new_playback_position()
       if (prefs->audio_player==AUD_PLAYER_SOX||prefs->audio_player==AUD_PLAYER_MPLAYER) {
 	mainw->aframeno=(gint64)(mainw->currticks-mainw->firstticks)*cfile->fps/U_SEC+audio_start;
-	if (G_UNLIKELY(mainw->loop_cont&&(mainw->aframeno>(mainw->audio_end?mainw->audio_end:cfile->laudio_time*cfile->fps)))) {
+	if (G_UNLIKELY(mainw->loop_cont&&(mainw->aframeno>(mainw->audio_end?mainw->audio_end:
+							   cfile->laudio_time*cfile->fps)))) {
 	  mainw->firstticks=mainw->startticks-mainw->deltaticks;
 	}
       }
 
 
-      if ((mainw->fixed_fpsd<=0.&&show_frame&&(mainw->vpp==NULL||mainw->vpp->fixed_fpsd<=0.||!mainw->ext_playback))||(mainw->fixed_fpsd>0.&&(mainw->currticks-last_display_ticks)/U_SEC>=1./mainw->fixed_fpsd)||(mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback&&(mainw->currticks-last_display_ticks)/U_SEC>=1./mainw->vpp->fixed_fpsd)||force_show) {
+      if ((mainw->fixed_fpsd<=0.&&show_frame&&(mainw->vpp==NULL||
+					       mainw->vpp->fixed_fpsd<=0.||!mainw->ext_playback))||
+	  (mainw->fixed_fpsd>0.&&(mainw->currticks-mainw->last_display_ticks)/U_SEC>=1./mainw->fixed_fpsd)||
+	  (mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback&&
+	   (mainw->currticks-mainw->last_display_ticks)/U_SEC>=1./mainw->vpp->fixed_fpsd)||force_show) {
 	// time to show a new frame
 
 #ifdef ENABLE_JACK
@@ -649,7 +679,14 @@
 
 	// load and display the new frame
 	load_frame_image(cfile->frameno);
-	last_display_ticks=mainw->currticks;
+	if (1||mainw->last_display_ticks==0) mainw->last_display_ticks=mainw->currticks;
+	else {
+	  if (mainw->vpp!=NULL&&mainw->ext_playback&&mainw->vpp->fixed_fpsd>0.) 
+	    mainw->last_display_ticks+=U_SEC/mainw->vpp->fixed_fpsd;
+	  else if (mainw->fixed_fpsd>0.) 
+	    mainw->last_display_ticks+=U_SEC/mainw->fixed_fpsd;
+	  else mainw->last_display_ticks=mainw->currticks;
+	}
 	force_show=FALSE;
       }
 
@@ -718,26 +755,15 @@
 	shown_paused_frames=mainw->effects_paused;
       }
 
-      else if (visible&&cfile->proc_ptr->frames_done>=cfile->progress_start&&cfile->proc_ptr->frames_done<=cfile->progress_end&&cfile->progress_end>0&&!mainw->effects_paused) {
-	if (progress_count++>=PROG_LOOP_VAL) {
-
-	  gettimeofday(&tv, NULL);
-	  mainw->currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
-	  timesofar=(mainw->currticks-mainw->timeout_ticks)/U_SEC;
-
-	  disp_fraction(cfile->proc_ptr->frames_done,cfile->progress_start,cfile->progress_end,timesofar,cfile->proc_ptr);
-	  progress_count=0;
-	}
-      }
       else {
-	if (progress_count++>=PROG_LOOP_VAL) {
-	  gtk_progress_bar_pulse(GTK_PROGRESS_BAR(cfile->proc_ptr->progressbar));
-	  progress_count=0;
+	if (visible&&cfile->proc_ptr->frames_done>=cfile->progress_start) {
+	  // display progress fraction or pulse bar
+	  progbar_pulse_or_fraction(cfile,cfile->proc_ptr->frames_done);
 	}
       }
     }
-    frames_done=cfile->proc_ptr->frames_done;
 
+    frames_done=cfile->proc_ptr->frames_done;
 
     if (cfile->clip_type==CLIP_TYPE_FILE&&cfile->fx_frame_pump>0&&cfile->progress_start+frames_done>=cfile->fx_frame_pump) {
       gint vend=cfile->fx_frame_pump+FX_FRAME_PUMP_VAL;
@@ -778,11 +804,13 @@
   gboolean finished=FALSE;
   gchar *mytext=g_strdup(text);
 
+  int frames_done;
+
   event_start=0;
   audio_start=mainw->play_start;
   if (visible) accelerators_swapped=FALSE;
   frames_done=disp_frames_done=0;
-  last_display_ticks=0;
+  mainw->last_display_ticks=0;
   shown_paused_frames=FALSE;
   est_time=-1.;
   force_show=TRUE;
@@ -980,7 +1008,15 @@
       }
     }
     // else call realtime effect pass
-    else (*mainw->progress_fn)(FALSE);
+    else {
+      (*mainw->progress_fn)(FALSE);
+      // display progress fraction or pulse bar
+      if (mainw->msg!=NULL&&strlen(mainw->msg)>0&&(frames_done=atoi(mainw->msg))>0)
+	cfile->proc_ptr->frames_done=atoi(mainw->msg);
+      else
+	cfile->proc_ptr->frames_done=0;
+      progbar_pulse_or_fraction(cfile,cfile->proc_ptr->frames_done);
+    }
 
 #ifdef DEBUG
     g_print("msg %s\n",mainw->msg);
@@ -1279,6 +1315,8 @@
 
   GtkWidget *prep_dialog;
 
+  mainw->fx1_bool=FALSE;
+
   if (swap_endian||(asigned==1&&rdet->aendian==AFORM_UNSIGNED)||(asigned==2&&rdet->aendian==AFORM_SIGNED)||(fps>0.&&fps!=rdet->fps)||(fps_denom>0&&(fps_num*1.)/(fps_denom*1.)!=rdet->fps)||(!anr&&(rdet->width!=width||rdet->height!=height)&&height*width>0)||(arate!=rdet->arate&&arate>0)) {
     g_free (msg2);
     msg2=g_strdup (_ ("LiVES recommends the following settings:\n\n"));
@@ -1355,7 +1393,7 @@
 
 
 gboolean 
-do_encoder_restrict_dialog (gint width, gint height, gdouble fps, gint fps_num, gint fps_denom, gint arate, gint asigned, gboolean swap_endian, gboolean anr) {
+do_encoder_restrict_dialog (gint width, gint height, gdouble fps, gint fps_num, gint fps_denom, gint arate, gint asigned, gboolean swap_endian, gboolean anr, gboolean save_all) {
   gchar *msg1=g_strdup_printf (_ ("\n\nDue to restrictions in the %s format\n"),prefs->encoder.of_desc);
   gchar *msg2=g_strdup ("");
   gchar *msg3=g_strdup ("");
@@ -1432,7 +1470,7 @@
     else anr=FALSE;
   }
   msg_a=g_strconcat (msg1,msg2,msg3,msg4,msg5,msg6,msg7,NULL);

LiVES-1.4.7.tar.bz2/src/effects-weed.c -> LiVES-1.4.8.tar.bz2/src/effects-weed.c Changed

@@ -1,6 +1,6 @@
 // effects-weed.c
 // LiVES (lives-exe)
-// (c) G. Finch 2005 - 2010 (salsaman@xs4all.nl)
+// (c) G. Finch 2005 - 2011 (salsaman@xs4all.nl)
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -965,15 +965,14 @@
 ///
 /// returns copy of current directory (before directory change) which should be freed after use 
 gchar *cd_to_plugin_dir(weed_plant_t *filter) {
-  char cwd[PATH_MAX];
+  char cwd[PATH_MAX],*ret;
   int error;
   weed_plant_t *plugin_info=weed_get_plantptr_value(filter,"plugin_info",&error);
-  char *dcwd;
   char *ppath=weed_get_string_value(plugin_info,"plugin_path",&error);
-  dcwd=getcwd(cwd,PATH_MAX);
+  ret=g_strdup(getcwd(cwd,PATH_MAX));
   dummyvar=chdir(ppath);
   weed_free(ppath);
-  return g_strdup(cwd);
+  return ret;
 }
 
 gint weed_reinit_effect (weed_plant_t *inst, gboolean deinit_first) {
@@ -1060,6 +1059,112 @@
 }
 
 
+static lives_filter_error_t process_func_threaded(weed_plant_t *inst, weed_plant_t **out_channels, weed_timecode_t tc) {
+  // split output(s) into horizontal slices
+  int offset=0;
+  int dheight,height;
+  int nthreads=0;
+  int error;
+  gboolean got_invalid=FALSE;
+  gboolean useme=FALSE;
+
+  int nchannels=weed_leaf_num_elements(inst,"out_channels");
+  int retval;
+  int minh;
+
+
+  struct _procvals procvals[MAX_FX_THREADS];
+  pthread_t dthreads[MAX_FX_THREADS];
+
+  weed_plant_t *xinst[MAX_FX_THREADS];
+  weed_plant_t **xchannels;
+  weed_plant_t *ctmpl;
+
+  void *tretval;
+
+  register int i,j;
+
+  height=weed_get_int_value(out_channels[0],"height",&error);
+
+  for (j=0;j<prefs->nfx_threads;j++) {
+    // each thread needs its own copy of the output channels, so it can have its own "offset" and "height"
+    // therefore it also needs its own copy of inst
+    // but note that "pixel_data" always points to the same memory buffer(s)
+    
+    xinst[j]=weed_plant_copy(inst);
+    xchannels=g_malloc(nchannels*sizeof(weed_plant_t *));
+    
+    for (i=0;i<nchannels;i++) {
+      xchannels[i]=weed_plant_copy(out_channels[i]);
+      height=weed_get_int_value(xchannels[i],"height",&error);
+
+      ctmpl=weed_get_plantptr_value(out_channels[i],"template",&error);
+      if (weed_plant_has_leaf(ctmpl,"vstep")) 
+	minh=weed_get_int_value(ctmpl,"vstep",&error);
+      else minh=4;
+
+      if (minh<4) minh=4;
+
+      dheight=CEIL((double)height/(double)prefs->nfx_threads,minh);
+
+      offset=dheight*j;
+
+      if ((height-offset-dheight)<minh) {
+	dheight=height-offset;
+	useme=1;
+      }
+      if ((height-offset)<minh) break;
+      
+      weed_set_int_value(xchannels[i],"offset",offset);
+      weed_set_int_value(xchannels[i],"height",dheight);
+    }
+    
+    weed_set_plantptr_array(xinst[j],"out_channels",nchannels,xchannels);
+    g_free(xchannels);
+    
+    procvals[j].inst=xinst[j];
+    procvals[j].tc=tc; // use same timecode for all slices
+    
+    if (offset>=height) break;
+    
+    if (!useme) {
+      // start a thread for processing
+      pthread_create(&dthreads[j],NULL,thread_process_func,&procvals[j]);
+      nthreads++; // actual number of threads used
+    }
+    else {
+      // use main thread
+      tretval=thread_process_func(&procvals[j]);
+      retval=GPOINTER_TO_INT((gpointer)tretval);
+      if (retval==WEED_ERROR_PLUGIN_INVALID) got_invalid=TRUE;
+    }
+  }
+  
+  // wait for threads to finish
+  for (j=0;j<prefs->nfx_threads;j++) {
+    retval=WEED_NO_ERROR;
+    
+    if (j<nthreads) {
+      pthread_join(dthreads[j],&tretval);
+      retval=GPOINTER_TO_INT((gpointer)tretval);
+    }
+    
+    xchannels=weed_get_plantptr_array(xinst[j],"out_channels",&error);
+    for (i=0;i<nchannels;i++) {
+      weed_plant_free(xchannels[i]);
+    }
+    weed_free(xchannels);
+    weed_plant_free(xinst[j]);
+    
+    if (retval==WEED_ERROR_PLUGIN_INVALID) got_invalid=TRUE;
+  }
+  
+  if (got_invalid) return FILTER_ERROR_MUST_RELOAD;
+
+  return FILTER_NO_ERROR;
+}
+
+
 
 lives_filter_error_t weed_apply_instance (weed_plant_t *inst, weed_plant_t *init_event, weed_plant_t **layers, int opwidth, int opheight, weed_timecode_t tc) {
   // here we:
@@ -1098,7 +1203,7 @@
   weed_plant_t **in_channels,**out_channels,*channel,*chantmpl;
   int frame;
   int inwidth,inheight,inpalette,outpalette,channel_flags,filter_flags=0;
-  int palette,cpalette,isubspace;
+  int palette,cpalette;
   int outwidth,outheight;
   gboolean needs_reinit=FALSE,inplace=FALSE;
   int incwidth,incheight,numplanes=0,width,height;
@@ -1110,10 +1215,10 @@
   gboolean rowstrides_changed;
   int nchr;
   int *layer_rows=NULL,*channel_rows;
-  gint retval=FILTER_NO_ERROR;
+  lives_filter_error_t retval=FILTER_NO_ERROR;
   int *mand;
   int maxinwidth=4,maxinheight=4;
-  int oclamping,iclamping;
+  int iclamping,oclamping,osampling,osubspace;
   int clip;
   int num_ctmpl,num_inc;
   weed_plant_t **in_ctmpls;
@@ -1314,8 +1419,7 @@
 	resize_layer(layer,width,height,GDK_INTERP_HYPER);
       }
       else {
-	gint interp=get_interp_value(prefs->pb_quality);
-	resize_layer(layer,width,height,interp);
+	resize_layer(layer,width,height,get_interp_value(prefs->pb_quality));
       }
 
       inwidth=weed_get_int_value(layer,"width",&error);
@@ -1387,12 +1491,15 @@
     if (weed_plant_has_leaf(layer,"YUV_clamping")) iclamping=(weed_get_int_value(layer,"YUV_clamping",&error));
     else iclamping=WEED_YUV_CLAMPING_CLAMPED;
 
-    // TODO - convert subspace if necessary
-    if (weed_plant_has_leaf(layer,"YUV_subspace")) isubspace=(weed_get_int_value(layer,"YUV_subspace",&error));
-    else isubspace=WEED_YUV_SUBSPACE_YUV;
+    if (weed_plant_has_leaf(chantmpl,"YUV_sampling")) osampling=(weed_get_int_value(layer,"YUV_sampling",&error));
+    else osampling=WEED_YUV_SAMPLING_DEFAULT;
+
+    if (weed_plant_has_leaf(chantmpl,"YUV_subspace")) osubspace=(weed_get_int_value(chantmpl,"YUV_subspace",&error));
+    else osubspace=WEED_YUV_SUBSPACE_YCBCR;
 
     if (weed_get_int_value(layer,"current_palette",&error)!=inpalette||oclamping!=iclamping) {
-      if (!convert_layer_palette(layer,inpalette,oclamping)) {
+      if (!convert_layer_palette_full(layer,inpalette,
+				      osampling,oclamping,osubspace)) {
 	weed_free(in_tracks);
 	weed_free(out_tracks);
 	weed_free(in_channels);
@@ -1567,7 +1674,8 @@
 
       set_channel_size(channel,opwidth/weed_palette_get_pixels_per_macropixel(palette),opheight,1,NULL);
 
-      create_empty_pixel_data(channel); // this will look at width, height, current_palette, and create an empty pixel_data and set rowstrides
+
+      create_empty_pixel_data(channel,FALSE); // this will look at width, height, current_palette, and create an empty pixel_data and set rowstrides
       // and update width and height if necessary

LiVES-1.4.7.tar.bz2/src/effects-weed.h -> LiVES-1.4.8.tar.bz2/src/effects-weed.h Changed

LiVES-1.4.7.tar.bz2/src/effects.c -> LiVES-1.4.8.tar.bz2/src/effects.c Changed

@@ -1,6 +1,6 @@
 // effects.c
 // LiVES (lives-exe)
-// (c) G. Finch 2003 - 2010
+// (c) G. Finch 2003 - 2011
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -203,7 +203,7 @@
   }
   g_free(tmp);
 
-  if (cfile->clip_type==CLIP_TYPE_FILE) {
+  if (cfile->clip_type==CLIP_TYPE_FILE&&rfx->status!=RFX_STATUS_WEED) {
     // pull a batch of frames for the backend to start processing
     cfile->fx_frame_pump=cfile->start;
   }
@@ -287,8 +287,9 @@
     else {
       int error;
       weed_plant_t *first_out=get_enabled_channel(rfx->source,0,FALSE);
-      cfile->hsize=weed_get_int_value(first_out,"width",&error);
-      cfile->vsize=weed_get_int_value(first_out,"height",&error);
+      weed_plant_t *first_ot=weed_get_plantptr_value(first_out,"template",&error);
+      cfile->hsize=weed_get_int_value(first_ot,"host_width",&error);
+      cfile->vsize=weed_get_int_value(first_ot,"host_height",&error);
     }
 
     if (rfx->num_in_channels>0) {
@@ -464,6 +465,15 @@
   g_snprintf (mainw->msg,256,"%d",i);
   // load, effect, save frame
 
+  // skip resizing virtual frames
+  if (resize_instance!=NULL&&is_virtual_frame(mainw->current_file,i)) {
+    if (++i>cfile->end) {
+      mainw->internal_messaging=FALSE;
+      g_snprintf(mainw->msg,9,"completed");
+    }
+    return 1;
+  }
+
   layer=weed_plant_new(WEED_PLANT_CHANNEL);
   weed_set_int_value(layer,"clip",mainw->current_file);
   weed_set_int_value(layer,"frame",i);
@@ -495,7 +505,7 @@
   if (cfile->clip_type==CLIP_TYPE_FILE) {
     cfile->frame_index[i-1]=-1;
   }
-
+  
   if (++i>cfile->end) {
     com=g_strdup_printf ("smogrify mv_mgk %s %d %d %s",cfile->handle,cfile->start,cfile->end,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
     dummyvar=system (com);
@@ -664,7 +674,7 @@
   layer=weed_plant_new(WEED_PLANT_CHANNEL);
   weed_set_int_value(layer,"clip",mainw->blend_file);
   weed_set_int_value(layer,"frame",blend_file->frameno);
-  if (!pull_frame(layer,mainw->files[mainw->blend_file]->img_type==IMG_TYPE_JPEG?"jpg":"png",tc)) {
+  if (!pull_frame(layer,blend_file->img_type==IMG_TYPE_JPEG?"jpg":"png",tc)) {
     weed_plant_free(layer);
     layer=NULL;
   }

LiVES-1.4.7.tar.bz2/src/events.c -> LiVES-1.4.8.tar.bz2/src/events.c Changed

@@ -618,14 +618,12 @@
 weed_plant_t *get_filter_map_after(weed_plant_t *event, gint ctrack) {
   // get filter_map following event; if ctrack!=-1000000 then we ignore filter maps with no in_track/out_track == ctrack
   void **init_events;
-  gboolean has_in,has_out;
   int error,num_init_events,i;
   weed_plant_t *init_event;
 
   while (event!=NULL) {
     if (get_event_hint(event)==WEED_EVENT_HINT_FILTER_MAP) {
       if (ctrack==-1000000) return event;
-      has_in=has_out=FALSE;
       if (!weed_plant_has_leaf(event,"init_events")) {
 	event=get_next_event(event);
 	continue;
@@ -2015,7 +2013,6 @@
 GtkWidget *events_rec_dialog (void) {
   GtkWidget *e_rec_dialog;
   GtkWidget *dialog_vbox;
-  GtkWidget *dialog_action_area;
   GtkWidget *vbox;
   GtkWidget *hbox;
   GtkWidget *eventbox;
@@ -2213,7 +2210,6 @@
 		    G_CALLBACK (set_render_choice),
 		    GINT_TO_POINTER (RENDER_CHOICE_EVENT_LIST));
 
-  dialog_action_area = GTK_DIALOG (e_rec_dialog)->action_area;
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
   GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
   gtk_dialog_add_action_widget (GTK_DIALOG (e_rec_dialog), cancelbutton, GTK_RESPONSE_CANCEL);
@@ -2797,7 +2793,6 @@
   char *key_string;
   void *init_event;
   weed_plant_t *next_frame_event,*return_event;
-  int num_elems=0;
   int i;
   char *filter_name;
   int new_file;
@@ -2816,7 +2811,29 @@
 
   tc=get_event_timecode (next_event);
 
-  if (mainw->playing_file!=-1&&tc>curr_tc) return next_event;
+  if (mainw->playing_file!=-1&&tc>curr_tc) {
+    // next event is in our future
+    if (mainw->multitrack!=NULL&&mainw->last_display_ticks>0) {
+      if ((mainw->fixed_fpsd>0.&&(curr_tc-mainw->last_display_ticks)/U_SEC>=1./mainw->fixed_fpsd)||
+	  (mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback&&
+	   (curr_tc-mainw->last_display_ticks)/U_SEC>=1./mainw->vpp->fixed_fpsd)) {
+	// ...but playing at fixed fps, which is faster than mt fps
+	mainw->pchains=pchains;
+	load_frame_image (cfile->last_frameno>=1?cfile->last_frameno:cfile->start);
+	if (mainw->last_display_ticks==0) mainw->last_display_ticks=curr_tc;
+	else {
+	  if (mainw->vpp!=NULL&&mainw->ext_playback&&mainw->vpp->fixed_fpsd>0.) 
+	    mainw->last_display_ticks+=U_SEC/mainw->vpp->fixed_fpsd;
+	  else if (mainw->fixed_fpsd>0.) 
+	    mainw->last_display_ticks+=U_SEC/mainw->fixed_fpsd;
+	  else mainw->last_display_ticks=curr_tc;
+	}
+	mainw->pchains=NULL;
+      }
+    }
+
+    return next_event;
+  }
 
   aseek_tc+=(weed_timecode_t)((gdouble)(tc-mainw->cevent_tc)*stored_avel);
   mainw->cevent_tc=tc;
@@ -2867,9 +2884,22 @@
 
   // if we are in multitrack mode, we will just set up NULL layers and let the effects pull our frames
   if (mainw->multitrack!=NULL) {
-    mainw->pchains=pchains;
-    load_frame_image (cfile->frameno);
-    mainw->pchains=NULL;
+    if ((mainw->fixed_fpsd<=0.&&(mainw->vpp==NULL||mainw->vpp->fixed_fpsd<=0.||!mainw->ext_playback))
+	||(mainw->fixed_fpsd>0.&&(curr_tc-mainw->last_display_ticks)/U_SEC>=1./mainw->fixed_fpsd)||
+	(mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback&&
+	 (curr_tc-mainw->last_display_ticks)/U_SEC>=1./mainw->vpp->fixed_fpsd)) {
+      mainw->pchains=pchains;
+      load_frame_image (cfile->frameno);
+      if (mainw->last_display_ticks==0) mainw->last_display_ticks=curr_tc;
+      else {
+	if (mainw->vpp!=NULL&&mainw->ext_playback&&mainw->vpp->fixed_fpsd>0.) 
+	  mainw->last_display_ticks+=U_SEC/mainw->vpp->fixed_fpsd;
+	else if (mainw->fixed_fpsd>0.) 
+	  mainw->last_display_ticks+=U_SEC/mainw->fixed_fpsd;
+	else mainw->last_display_ticks=curr_tc;
+      }
+      mainw->pchains=NULL;
+    }
   }
   else {
     if (mainw->num_tracks>1) {
@@ -2912,9 +2942,9 @@
 	if (mainw->playing_file>-1) while (g_main_context_iteration (NULL,FALSE));
 	mainw->current_file=current_file;
       }
-      weed_free(mainw->clip_index);
-      weed_free(mainw->frame_index);
-      mainw->clip_index=mainw->frame_index=NULL;
+      //weed_free(mainw->clip_index);
+      //weed_free(mainw->frame_index);
+      //mainw->clip_index=mainw->frame_index=NULL;
       break;
     }
     else {
@@ -2928,9 +2958,9 @@
       mainw->pchains=NULL;
     }
   }
-  weed_free(mainw->clip_index);
-  weed_free(mainw->frame_index);
-  mainw->clip_index=mainw->frame_index=NULL;
+  //weed_free(mainw->clip_index);
+  //weed_free(mainw->frame_index);
+  //mainw->clip_index=mainw->frame_index=NULL;
   if (mainw->playing_file>-1) while (g_main_context_iteration(NULL,FALSE));
   cfile->next_event=get_next_event(next_event);
   break;
@@ -3045,7 +3075,6 @@
 
   case WEED_EVENT_HINT_FILTER_MAP:
     mainw->filter_map=next_event;
-    if (weed_plant_has_leaf(next_event,"init_events")) num_elems=weed_leaf_num_elements(next_event,"init_events");
 #ifdef DEBUG_EVENTS
     g_print ("got new effect map with %d keys\n",num_elems);
 #endif
@@ -3620,7 +3649,7 @@
       do {
 	rdet->suggestion_followed=FALSE;
 	if ((response=gtk_dialog_run(GTK_DIALOG(rdet->dialog)))==GTK_RESPONSE_OK) if (rdet->enc_changed) {
-	    check_encoder_restrictions(FALSE,TRUE);
+	    check_encoder_restrictions(FALSE,TRUE,TRUE);
 	}
       } while (rdet->suggestion_followed);
 
@@ -3976,7 +4005,9 @@
   int error;
   register int i,j;
 
-  float *matrix[ntracks];
+  double *matrix[ntracks+nbtracks];
+
+  ntracks+=nbtracks;
 
   if (shortcut==NULL||*shortcut==NULL) stored_fmap=NULL;
 
@@ -4005,9 +4036,8 @@
     if (fmap==*shortcut) fmap=stored_fmap;
   }
 
-
   for (i=0;i<ntracks;i++) {
-    matrix[i]=(float *)g_malloc(ntracks*sizeof(float));
+    matrix[i]=(double *)g_malloc(ntracks*sizeof(double));
     for (j=0;j<ntracks;j++) {
       matrix[i][j]=0.;
     }
@@ -4018,8 +4048,10 @@
   if (fmap!=NULL) {
     // here we look at all init_events in fmap. If any have "host_audio_transition" set, then
     // we we look at the 2 in channels. We first multiply matrix[t0][...] by trans
-    // then we add matrix[t1][...]*(1.0 - trans) to matrix[t0][...]
+    // then we add matrix[t1][...]*(1.0 - trans) to matrix[t3][...]
     // where trans is the normalised value of the transition parameter
+    // t3 is the output channel, this is usually the same track as t0
+    // thus each row in the matrix represents the contribution from each layer (track)
     if (weed_plant_has_leaf(fmap,"init_events")) {
       weed_plant_t **iev=(weed_plant_t **)weed_get_voidptr_array(fmap,"init_events",&error);
       gint nins=weed_leaf_num_elements(fmap,"init_events");
@@ -4071,6 +4103,9 @@
     }
   }
   
+
+  // now we select as visibility, whichever row is the first layer to have a non-blank frame
+
   for (i=0;i<nxtracks;i++) {
     if (clips[i]>=0&&frames[i]>0) {
       got=i+nbtracks;
@@ -4082,7 +4117,7 @@
   weed_free(frames);
 
   if (got==-1) {
-    // all frames blank
+    // all frames blank - backing audio only
     for (i=0;i<ntracks;i++) {
       if (i>=nbtracks) vis[i]=0.;
       g_free(matrix[i]);
@@ -4091,8 +4126,7 @@
   }
 
   for (i=nbtracks;i<ntracks;i++) {
-    if (i<=nxtracks) vis[i]=matrix[got][i];
-    else vis[i]=0.;
+    vis[i]=matrix[got][i];
   }

LiVES-1.4.7.tar.bz2/src/framedraw.c -> LiVES-1.4.8.tar.bz2/src/framedraw.c Changed

LiVES-1.4.7.tar.bz2/src/giw/giwknob.c -> LiVES-1.4.8.tar.bz2/src/giw/giwknob.c Changed

LiVES-1.4.7.tar.bz2/src/giw/giwled.c -> LiVES-1.4.8.tar.bz2/src/giw/giwled.c Changed

LiVES-1.4.7.tar.bz2/src/giw/giwvslider.c -> LiVES-1.4.8.tar.bz2/src/giw/giwvslider.c Changed

@@ -430,7 +430,6 @@
 			GdkEventButton   *event)
 {
   GiwVSlider *vslider;
-  gint x, y;
   
   g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GIW_IS_VSLIDER (widget), FALSE);
@@ -441,8 +440,8 @@
   if (vslider->mouse_policy==GIW_VSLIDER_MOUSE_DISABLED) return(FALSE);
   
   // Get the position inside the vslider
-  x=event->x-vslider->x;
-  y=event->y-vslider->y;
+  //x=event->x-vslider->x;
+  //y=event->y-vslider->y;
   
   if (vslider->button == event->button){
     // If the mouse policy is to update delayed, it's time to update the value (the button was released)
@@ -470,7 +469,7 @@
 			GdkEventMotion   *event)
 {
   GiwVSlider *vslider;
-  gint x, y;
+  gint y;
   gdouble new_value;
   
   g_return_val_if_fail (widget != NULL, FALSE);
@@ -482,7 +481,7 @@
   if (vslider->mouse_policy==GIW_VSLIDER_MOUSE_DISABLED) return(FALSE);
       
   // Get the position inside the vslider
-  x=event->x-vslider->x;
+  //x=event->x-vslider->x;
   y=event->y-vslider->y;
   
   // If the mouse policy is to update automatically, change the value now if it's valid

LiVES-1.4.7.tar.bz2/src/gui.c -> LiVES-1.4.8.tar.bz2/src/gui.c Changed

@@ -1,6 +1,6 @@
 // gui.c
 // LiVES
-// (c) G. Finch 2004 - 2010 <salsaman@xs4all.nl>
+// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl>
 // Released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -213,7 +213,6 @@
 #endif 
 
   GtkObject *spinbutton_pb_fps_adj;
-  GtkObject *spinbutton_adj;
 
   GtkWidget *new_test_rfx;
   GtkWidget *edit_test_rfx;
@@ -339,7 +338,7 @@
                               GDK_o, GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  mainw->open_sel = gtk_menu_item_new_with_mnemonic (_("O_pen File Selection..."));
+  mainw->open_sel = gtk_menu_item_new_with_mnemonic (_("O_pen Part of File..."));
 
   gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->open_sel);
 
@@ -349,7 +348,7 @@
                               GDK_l, GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  mainw->open_vcd_menu = gtk_menu_item_new_with_mnemonic (_("Import Selection from _dvd/vcd..."));
+  mainw->open_vcd_menu = gtk_menu_item_new_with_mnemonic (_("Import from _dvd/vcd..."));
   gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->open_vcd_menu);
   mainw->open_vcd_submenu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->open_vcd_menu), mainw->open_vcd_submenu);
@@ -357,13 +356,13 @@
     gtk_widget_modify_bg(mainw->open_vcd_submenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
   }
 
-  mainw->open_dvd = gtk_menu_item_new_with_mnemonic (_("Import Selection from _dvd"));
+  mainw->open_dvd = gtk_menu_item_new_with_mnemonic (_("Import from _dvd"));
   gtk_container_add (GTK_CONTAINER (mainw->open_vcd_submenu), mainw->open_dvd);
 
-  mainw->open_vcd = gtk_menu_item_new_with_mnemonic (_("Import Selection from _vcd"));
+  mainw->open_vcd = gtk_menu_item_new_with_mnemonic (_("Import from _vcd"));
   gtk_container_add (GTK_CONTAINER (mainw->open_vcd_submenu), mainw->open_vcd);
 
-  mainw->open_device_menu = gtk_menu_item_new_with_mnemonic (_("_Import from Device"));
+  mainw->open_device_menu = gtk_menu_item_new_with_mnemonic (_("_Import from Firewire"));
   gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->open_device_menu);
   mainw->open_device_submenu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->open_device_menu), mainw->open_device_submenu);
@@ -396,7 +395,7 @@
     gtk_widget_show (mainw->open_loc);
   }
 
-  mainw->add_live_menu = gtk_menu_item_new_with_mnemonic (_("_Add Live Input..."));
+  mainw->add_live_menu = gtk_menu_item_new_with_mnemonic (_("_Add Webcam/TV card..."));
 
 #if defined(HAVE_UNICAP) || defined(HAVE_YUV4MPEG)
   gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->add_live_menu);
@@ -414,7 +413,7 @@
     gtk_widget_show (submenu);
 
 #ifdef HAVE_UNICAP
-  menuitem = gtk_menu_item_new_with_mnemonic (_("Add Live _Unicap Device"));
+  menuitem = gtk_menu_item_new_with_mnemonic (_("Add _Unicap Device"));
   gtk_container_add (GTK_CONTAINER (submenu), menuitem);
   gtk_widget_show (menuitem);
   g_signal_connect (GTK_OBJECT (menuitem), "activate",
@@ -433,7 +432,7 @@
 			NULL);
     }
 
-    menuitem = gtk_menu_item_new_with_mnemonic (_("Add Live _TV Device"));
+    menuitem = gtk_menu_item_new_with_mnemonic (_("Add _TV Device"));
     gtk_container_add (GTK_CONTAINER (submenu), menuitem);
     gtk_widget_show (menuitem);
 
@@ -976,6 +975,12 @@
 
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->showsubs),prefs->show_subtitles);
 
+  mainw->letter = gtk_check_menu_item_new_with_mnemonic (_("Letterbox mode"));
+  gtk_widget_show (mainw->letter);
+  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->letter);
+
+  gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->showsubs),prefs->letterbox);
+
   effects = gtk_menu_item_new_with_mnemonic (_ ("Effect_s"));
   gtk_widget_show (effects);
   gtk_container_add (GTK_CONTAINER (mainw->menubar), effects);
@@ -1749,8 +1754,6 @@
     mainw->m_mutebutton = gtk_menu_item_new ();
   }
 
-  spinbutton_adj = gtk_adjustment_new (1., 0., 1., 0.01, 0.1, 0.);
-
   mainw->vol_label=GTK_WIDGET(gtk_tool_item_new());
   label=gtk_label_new(_("Volume"));
   gtk_container_add(GTK_CONTAINER(mainw->vol_label),label);
@@ -2474,15 +2477,18 @@
   g_signal_connect (GTK_OBJECT (mainw->stop), "activate",
                       G_CALLBACK (on_stop_activate),
                       NULL);
-  g_signal_connect (GTK_OBJECT (mainw->full_screen), "activate",
-                      G_CALLBACK (on_full_screen_activate),
-                      NULL);
+  mainw->fullscreen_cb_func=g_signal_connect (GTK_OBJECT (mainw->full_screen), "activate",
+					      G_CALLBACK (on_full_screen_activate),
+					      NULL);
   g_signal_connect (GTK_OBJECT (mainw->sw_sound), "activate",
                       G_CALLBACK (on_boolean_toggled),
 		    &mainw->save_with_sound); // TODO - make pref
   g_signal_connect (GTK_OBJECT (mainw->showsubs), "activate",
                       G_CALLBACK (on_boolean_toggled),
                       &prefs->show_subtitles);
+  g_signal_connect (GTK_OBJECT (mainw->letter), "activate",
+                      G_CALLBACK (on_boolean_toggled),
+                      &prefs->letterbox);
   g_signal_connect (GTK_OBJECT (mainw->aload_subs), "activate",
                       G_CALLBACK (on_boolean_toggled),
                       &prefs->autoload_subs);
@@ -2492,9 +2498,9 @@
   g_signal_connect (GTK_OBJECT (mainw->dsize), "activate",
                       G_CALLBACK (on_double_size_activate),
                       NULL);
-  g_signal_connect (GTK_OBJECT (mainw->sepwin), "activate",
-                      G_CALLBACK (on_sepwin_activate),
-                      NULL);
+  mainw->sepwin_cb_func=g_signal_connect (GTK_OBJECT (mainw->sepwin), "activate",
+					  G_CALLBACK (on_sepwin_activate),
+					  NULL);
   g_signal_connect (GTK_OBJECT (mainw->fade), "activate",
                       G_CALLBACK (on_fade_activate),
                       NULL);
@@ -3925,6 +3931,7 @@
   gtk_box_pack_start (GTK_BOX (vbox), mainw->splash_label, TRUE, TRUE, 0);
 
   mainw->splash_progress = gtk_progress_bar_new ();
+  gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(mainw->splash_progress),.01);
 
   if (palette->style&STYLE_1) {
     gtk_widget_modify_fg(mainw->splash_progress, GTK_STATE_NORMAL, &palette->normal_fore);

LiVES-1.4.7.tar.bz2/src/interface.c -> LiVES-1.4.8.tar.bz2/src/interface.c Changed

@@ -1,6 +1,6 @@
 // interface.c
 // LiVES
-// (c) G. Finch 2003 - 2010 <salsaman@xs4all.nl>
+// (c) G. Finch 2003 - 2011 <salsaman@xs4all.nl>
 // Released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -31,12 +31,18 @@
 static gulong arrow_id; // works around a known bug in gobject
 
 
-void add_suffix_check(GtkBox *box) {
+void add_suffix_check(GtkBox *box, const gchar *ext) {
 
   GtkWidget *hbox;
   GtkWidget *checkbutton = gtk_check_button_new ();
   GtkWidget *eventbox=gtk_event_box_new();
-  GtkWidget *label=gtk_label_new_with_mnemonic (_ ("Let LiVES set the _file extension"));
+  GtkWidget *label;
+  if (ext==NULL) label=gtk_label_new_with_mnemonic (_ ("Let LiVES set the _file extension"));
+  else {
+    gchar *txt=g_strdup_printf(_ ("Let LiVES set the _file extension (.%s)"),ext);
+    label=gtk_label_new_with_mnemonic (txt);
+    g_free(txt);
+  }
 
   gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton);
 
@@ -69,6 +75,11 @@
 GtkWidget*
 create_fileselection (const gchar *title, gint preview_type, gpointer free_on_cancel)
 {
+  // 1 - video and audio open
+  // preview type 2 is export audio
+  // preview_type 3 was save_file, no longer used (deprecated)
+
+
   GtkWidget *fileselection;
   GtkWidget *ok_button;
   GtkWidget *cancel_button;
@@ -108,24 +119,15 @@
 
   gtk_widget_grab_focus (fileselection);
   
-  // preview types here are
-  // 1 - video and audio open
-  // 2 - audio open
-  // 3 - save file
-
-
   if (preview_type==1||preview_type==2) widget_add_preview(GTK_BOX (GTK_FILE_SELECTION(fileselection)->main_vbox),GTK_BOX (GTK_FILE_SELECTION (fileselection)->action_area),GTK_BOX(GTK_FILE_SELECTION(fileselection)->main_vbox),preview_type);
-  else if (preview_type==3) {
-    mainw->fx1_bool=TRUE;
-    add_suffix_check(GTK_BOX (GTK_FILE_SELECTION (fileselection)->action_area));
-  }
-
   g_signal_connect (cancel_button, "clicked",G_CALLBACK (on_cancel_button1_clicked),free_on_cancel);
 
   gtk_widget_show_all (fileselection);
   return fileselection;
 }
 
+
+
 static GtkWidget *add_deinterlace_checkbox(GtkBox *for_deint) {
   GtkWidget *hbox=gtk_hbox_new (FALSE, 0);
   GtkWidget *checkbutton = gtk_check_button_new ();
@@ -242,6 +244,7 @@
 
   gtk_widget_destroy(arrow);
 
+  // remove this signal because its user_data is invalid
   if (g_signal_handler_is_connected (ahbox, arrow_id)) {
     g_signal_handler_disconnect (ahbox, arrow_id);
   }
@@ -799,6 +802,18 @@
   return filew;
 }
 
+static void on_resizecb_toggled (GtkToggleButton *t, gpointer user_data) {
+  GtkWidget *cb=(GtkWidget *)user_data;
+
+  if (!gtk_toggle_button_get_active(t)) {
+    gtk_widget_set_sensitive(cb,FALSE);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb),FALSE);
+  }
+  else {
+    gtk_widget_set_sensitive(cb,TRUE);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb),prefs->enc_letterbox);
+  }
+}
 
 
 
@@ -811,9 +826,11 @@
   GtkWidget *dialog_action_area;
   GtkWidget *cancelbutton;
   GtkWidget *okbutton;
-  GtkWidget *checkbutton;
+  GtkWidget *checkbutton=NULL;
+  GtkWidget *checkbutton2;
   GtkWidget *label;
   GtkWidget *hbox;
+  GtkWidget *eventbox;
 
   dialog = gtk_dialog_new ();
   gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Encoding options"));
@@ -842,23 +859,79 @@
 
   if (opt_resize) {      
     checkbutton = gtk_check_button_new ();
-    if (text2!=NULL) label=gtk_label_new_with_mnemonic (_ ("<------------- (Check the box to resize as suggested)"));
-    else label=gtk_label_new_with_mnemonic (_ ("<------------- (Check the box to use the size recommendation)"));
+    if (text2!=NULL) label=gtk_label_new_with_mnemonic (_ ("<------------- (Check the box to re_size as suggested)"));
+    else label=gtk_label_new_with_mnemonic (_ ("<------------- (Check the box to use the _size recommendation)"));
+    eventbox=gtk_event_box_new();
     gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton);
+    gtk_container_add(GTK_CONTAINER(eventbox),label);
+    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
+		      G_CALLBACK (label_act_toggle),
+		      checkbutton);
     if (palette->style&STYLE_1) {
       gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
+      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
+      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
     }
+
     hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), checkbutton, TRUE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 10);
-    GTK_WIDGET_SET_FLAGS (checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
     gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
-    g_signal_connect (GTK_OBJECT (checkbutton), "toggled",
-		      G_CALLBACK (on_boolean_toggled),
-		      &mainw->fx1_bool);
+    gtk_box_pack_start (GTK_BOX (hbox), checkbutton, FALSE, FALSE, 10);
+    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+    gtk_widget_show_all (hbox);
+    
+    g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
+			    G_CALLBACK (on_boolean_toggled),
+			    &mainw->fx1_bool);
+
   }
   else if (text2==NULL) mainw->fx1_bool=TRUE;
 
+
+
+  if (text2!=NULL&&(mainw->fx1_bool||opt_resize)) {
+    checkbutton2 = gtk_check_button_new ();
+    gtk_tooltips_set_tip (mainw->tooltips, checkbutton2, _("Draw black rectangles either above or to the sides of the image, to prevent it from stretching."), NULL);
+    eventbox=gtk_event_box_new();
+    gtk_tooltips_copy(eventbox,checkbutton2);
+    label=gtk_label_new_with_mnemonic (_("Use _letterboxing to maintain aspect ratio (optional)"));
+    gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton2);
+    
+    gtk_container_add(GTK_CONTAINER(eventbox),label);
+    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
+		      G_CALLBACK (label_act_toggle),
+		      checkbutton2);
+    if (palette->style&STYLE_1) {
+      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
+      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
+      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+    }
+
+    if (opt_resize) {
+      gtk_widget_set_sensitive(checkbutton2,FALSE);
+      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton2),FALSE);
+    }
+    else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton2),prefs->enc_letterbox);
+
+    hbox = gtk_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
+    gtk_box_pack_start (GTK_BOX (hbox), checkbutton2, FALSE, FALSE, 10);
+    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+    gtk_widget_show_all (hbox);
+    
+    g_signal_connect_after (GTK_OBJECT (checkbutton2), "toggled",
+			    G_CALLBACK (on_boolean_toggled),
+			    &prefs->enc_letterbox);
+
+
+    if (opt_resize) 
+      g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
+			      G_CALLBACK (on_resizecb_toggled),
+			      checkbutton2);
+
+
+  }
+
+
   dialog_action_area = GTK_DIALOG (dialog)->action_area;
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
@@ -3054,11 +3127,12 @@
 
     // options

LiVES-1.4.7.tar.bz2/src/jack.c -> LiVES-1.4.8.tar.bz2/src/jack.c Changed

@@ -97,7 +97,7 @@
   jack_activate(jack_transport_client);
   jack_set_sync_timeout(jack_transport_client,5000000); // seems to not work
   jack_set_sync_callback (jack_transport_client, lives_start_ready_callback, NULL);
-  gtk_timeout_add(KEY_RPT_INTERVAL,&lives_jack_poll,NULL);
+  mainw->jack_trans_poll=TRUE;
 #else
   jack_client_close (jack_transport_client);
   jack_transport_client=NULL;
@@ -120,9 +120,7 @@
 #ifdef ENABLE_JACK_TRANSPORT
   jack_nframes_t srate; 
   jack_position_t pos;
-  jack_transport_state_t jacktstate;
 
-  jacktstate=jack_transport_query (jack_transport_client, &pos);
   srate=jack_get_sample_rate(jack_transport_client);
   return (gdouble)pos.frame/(gdouble)srate;
 #endif
@@ -163,7 +161,7 @@
 }
 #endif
 
-gboolean lives_jack_poll(gpointer data) {
+gboolean lives_jack_poll(void) {
   // data is always NULL
   // must return TRUE
 #ifdef ENABLE_JACK_TRANSPORT
@@ -1298,7 +1296,7 @@
     jackd->seek_pos=jackd->seek_end=0;
     jackd->msgq=NULL;
     jackd->num_calls=0;
-    //jackd->astream_file=NULL;
+    jackd->astream_fd=-1;
     jackd->jackd_died=FALSE;
     gettimeofday(&jackd->last_reconnect_attempt, 0);
     jackd->num_output_channels=2;
@@ -1331,7 +1329,7 @@
     jackd->seek_pos=jackd->seek_end=0;
     jackd->msgq=NULL;
     jackd->num_calls=0;
-    //jackd->astream_file=NULL;
+    jackd->astream_fd=-1;
     jackd->jackd_died=FALSE;
     gettimeofday(&jackd->last_reconnect_attempt, 0);
     jackd->num_input_channels=2;

LiVES-1.4.7.tar.bz2/src/jack.h -> LiVES-1.4.8.tar.bz2/src/jack.h Changed

LiVES-1.4.7.tar.bz2/src/keyboard.c -> LiVES-1.4.8.tar.bz2/src/keyboard.c Changed

@@ -1,6 +1,6 @@
 // keyboard.c
 // LiVES
-// (c) G. Finch 2004 - 2010 <salsaman@xs4all.nl>
+// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -25,10 +25,78 @@
 #endif
 
 
+static void handle_omc_events(void) {
+  // check for external controller events
+
+#ifdef OMC_MIDI_IMPL
+  gint midi_check_rate;
+  gboolean gotone;
+#endif
+
+  int i;
+
+#ifdef OMC_JS_IMPL
+    if (mainw->ext_cntl[EXT_CNTL_JS]) {
+      gchar *string=js_mangle();
+      if (string!=NULL) {
+	omc_process_string(OMC_JS,string,FALSE,NULL);
+	g_free(string);
+	string=NULL;
+      }
+    }
+#endif // OMC_JS_IMPL
+    
+#ifdef OMC_MIDI_IMPL
+    midi_check_rate=prefs->midi_check_rate;
+#ifdef ALSA_MIDI
+    if (prefs->use_alsa_midi) midi_check_rate=1; // because we loop for events in midi_mangle()
+#endif
+    if (mainw->ext_cntl[EXT_CNTL_MIDI]) {
+      do {
+	gotone=FALSE;
+	for (i=0;i<midi_check_rate;i++) {
+	  gchar *string=midi_mangle();
+	  if (string!=NULL) {
+	    omc_process_string(OMC_MIDI,string,FALSE,NULL);
+	    g_free(string);
+	    string=NULL;
+#ifdef ALSA_MIDI
+	    if (prefs->use_alsa_midi) gotone=TRUE;
+#endif
+	  }
+	}
+      } while (gotone);
+    }
+#endif // OMC_MIDI_IMPL
+}
+
+
+
+
+
+gboolean ext_triggers_poll(gpointer data) {
+  // check for external controller events
+#ifdef ENABLE_JACK
+#ifdef ENABLE_JACK_TRANSPORT
+  if (mainw->jack_trans_poll) lives_jack_poll(); // check for jack transport start
+#endif
+#endif
+
+#ifdef ENABLE_OSC
+  handle_omc_events(); // check for playback start triggered by js, MIDI, etc.
+#endif
+
+  return TRUE;
+}
+
+
+
 gboolean 
 key_snooper (GtkWidget *widget, GdkEventKey *event, gpointer data) {
   // this gets called for every keypress - check for cached keys
-  guint modifiers = gtk_accelerator_get_default_mod_mask ();
+  guint modifiers;
+  handle_omc_events();
+  modifiers = gtk_accelerator_get_default_mod_mask ();
   return pl_key_function ((event->type==GDK_KEY_PRESS),event->keyval,event->state&modifiers      );
 }
 
@@ -36,8 +104,7 @@
 gboolean 
 plugin_poll_keyboard (gpointer data) {
   static int last_kb_time=0,current_kb_time;
-  static int loop_count=0;
-  int i;
+
   // this is a function which should be called periodically during playback.
   // If a video playback plugin has control of the keyboard 
   // (e.g fullscreen video playback plugins)
@@ -46,11 +113,6 @@
   // as of LiVES 1.1.0, this is now called 10 times faster to provide lower latency for
   // OSC and external controllers
 
-#ifdef OMC_MIDI_IMPL
-  gint midi_check_rate;
-  gboolean gotone;
-#endif
-
   if (mainw->ext_keyboard) {
     //let plugin call pl_key_function itself, with any keycodes it has received
     if (mainw->vpp->send_keycodes!=NULL) (*mainw->vpp->send_keycodes)(pl_key_function);
@@ -61,7 +123,6 @@
   // we also auto-repeat our cached keys
   if (cached_key&&current_kb_time-last_kb_time>KEY_RPT_INTERVAL*10) {
     last_kb_time=current_kb_time;
-    loop_count=0;
     gtk_accel_groups_activate (G_OBJECT (mainw->LiVES),(guint)cached_key,cached_mod);
   }
 
@@ -72,52 +133,19 @@
   if (prefs->osc_udp_started) lives_osc_poll(NULL);
 #endif
 
+
+  if (!mainw->is_processing||(mainw->multitrack!=NULL&&mainw->playing_file==mainw->multitrack->render_file&&!mainw->multitrack->is_rendering)) {
+
   // check jack transport state
 #ifdef ENABLE_JACK
 #ifdef ENABLE_JACK_TRANSPORT
-  if (!mainw->is_processing||(mainw->multitrack!=NULL&&mainw->playing_file==mainw->multitrack->render_file&&!mainw->multitrack->is_rendering)) {
-    lives_jack_poll(NULL);
-  }
+    if (mainw->jack_trans_poll) lives_jack_poll(); // check for jack transport start
 #endif
 #endif
 
-  // check for external controller events
-#ifdef ENABLE_OSC
-#ifdef OMC_JS_IMPL
-  if (mainw->ext_cntl[EXT_CNTL_JS]) {
-    gchar *string=js_mangle();
-    if (string!=NULL) {
-      omc_process_string(OMC_JS,string,FALSE,NULL);
-      g_free(string);
-      string=NULL;
-    }
-  }
-#endif // OMC_JS_IMPL
+    handle_omc_events();
 
-#ifdef OMC_MIDI_IMPL
-  midi_check_rate=prefs->midi_check_rate;
-#ifdef ALSA_MIDI
-  if (prefs->use_alsa_midi) midi_check_rate=1; // because we loop for events in midi_mangle()
-#endif
-  if (mainw->ext_cntl[EXT_CNTL_MIDI]) {
-    do {
-      gotone=FALSE;
-      for (i=0;i<midi_check_rate;i++) {
-	gchar *string=midi_mangle();
-	if (string!=NULL) {
-	  omc_process_string(OMC_MIDI,string,FALSE,NULL);
-	  g_free(string);
-	  string=NULL;
-#ifdef ALSA_MIDI
-	  if (prefs->use_alsa_midi) gotone=TRUE;
-#endif
-	}
-      }
-    } while (gotone);
   }
-#endif // OMC_MIDI_IMPL
-
-#endif // ENABLE_OSC
   return TRUE;
 }

LiVES-1.4.7.tar.bz2/src/keyboard.h -> LiVES-1.4.8.tar.bz2/src/keyboard.h Changed

LiVES-1.4.7.tar.bz2/src/lives-yuv4mpeg.c -> LiVES-1.4.8.tar.bz2/src/lives-yuv4mpeg.c Changed

LiVES-1.4.7.tar.bz2/src/main.c -> LiVES-1.4.8.tar.bz2/src/main.c Changed

@@ -49,6 +49,7 @@
 #include "paramwindow.h"
 #include "stream.h"
 #include "startup.h"
+#include "cvirtual.h"
 
 #ifdef ENABLE_OSC
 #include "omc-learn.h"
@@ -71,6 +72,11 @@
 #include <mach/mach_host.h>
 #endif
 
+#ifdef USE_LIBPNG
+#include <png.h>
+#include <setjmp.h>
+#endif
+
 
 ////////////////////////////////
 capability *capable;
@@ -274,7 +280,6 @@
   prefs->show_gui=TRUE;
   prefs->show_splash=TRUE;
   prefs->show_playwin=TRUE;
-  prefs->show_threaded_dialog=TRUE;
   prefs->sepwin_type=1;
   prefs->show_framecount=TRUE;
   prefs->audio_player=AUD_PLAYER_SOX;
@@ -286,6 +291,8 @@
   prefs->autoload_subs=TRUE;
   prefs->show_subtitles=TRUE;
 
+  prefs->letterbox=FALSE;
+
   if (!capable->smog_version_correct||!capable->can_write_to_tempdir) {
     g_snprintf(prefs->theme,64,"none");
     return FALSE;
@@ -454,7 +461,8 @@
   mainw->volume=1.f;
   mainw->ccpd_with_sound=TRUE;
 
-  mainw->loop=mainw->loop_cont=FALSE;
+  mainw->loop=TRUE;
+  mainw->loop_cont=FALSE;
   mainw->target_table=target_table;
 
   prefs->max_modes_per_key=0;
@@ -578,7 +586,6 @@
   mainw->record_foreign=FALSE;
   mainw->play_window=NULL;
   mainw->opwx=mainw->opwy=-1;
-  mainw->save_all=TRUE;
   mainw->frame_layer=NULL;
   mainw->in_fs_preview=FALSE;
   mainw->effects_paused=FALSE;
@@ -855,6 +862,14 @@
   mainw->has_custom_gens=FALSE;
   mainw->has_custom_utilities=FALSE;
 
+  mainw->log_fd=-2;
+
+  mainw->last_display_ticks=0;
+
+  mainw->jack_trans_poll=FALSE;
+
+  mainw->pw_exp_is_blocked=TRUE;
+
   /////////////////////////////////////////////////// add new stuff just above here ^^
 
   g_snprintf(mainw->first_info_file,255,"%s/.info.%d",prefs->tmpdir,getpid());
@@ -944,6 +959,9 @@
     prefs->unstable_fx=FALSE;
 
     prefs->disabled_decoders=get_list_pref("disabled_decoders");
+
+    prefs->enc_letterbox=FALSE;
+
     //////////////////////////////////////////////////////////////////
 
     weed_memory_init();
@@ -1757,7 +1775,7 @@
   g_printerr("%s",_("-noset           : do not load any set on startup\n"));
   g_printerr("%s",_("-norecover       : force no-loading of crash recovery\n"));
   g_printerr("%s",_("-recover         : force loading of crash recovery\n"));
-  g_printerr("%s",_("-nothreaddialog  : avoid threaded dialogs\n"));
+  g_printerr("%s",_("-nothreaddialog  : doe nothing - retained for backwards compatibility\n"));
   g_printerr("%s",_("-nogui           : do not show the gui\n"));
   g_printerr("%s",_("-nosplash        : do not show the splash window\n"));
   g_printerr("%s",_("-noplaywin       : do not show the play window\n"));
@@ -1947,7 +1965,7 @@
     prefs->startup_phase=0;
   }
 
-  if (strlen (start_file)) {
+  if (strlen (start_file)&&strcmp(start_file,"-")) {
     splash_end();
     deduce_file(start_file,start,end);
     got_files=TRUE;
@@ -1955,6 +1973,8 @@
     set_main_title(NULL,0);
   }
 
+  splash_end();
+
   if (prefs->crash_recovery&&!no_recover) got_files=check_for_recovery_files(auto_recover);
 
   if (!mainw->foreign&&!got_files&&prefs->ar_clipset) {
@@ -1974,13 +1994,14 @@
   if (prefs->osc_start) prefs->osc_udp_started=lives_osc_init(prefs->osc_udp_port);
 #endif
 
-  splash_end();
-
   if (mainw->recoverable_layout) do_layout_recover_dialog();
 
   if (!prefs->show_gui&&prefs->startup_interface==STARTUP_CE) mainw->is_ready=TRUE;
 
   mainw->go_away=FALSE;
+
+  gtk_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+
   return FALSE;
 }
 
@@ -2011,24 +2032,30 @@
   textdomain (GETTEXT_PACKAGE);
 #endif
 
+  // force decimal point to be a "."
   putenv ("LC_NUMERIC=C");
 
   gtk_init (&argc, &argv);
 
-  g_log_set_always_fatal (0);
+  // don't crash on GTK+ fatals
+  //g_log_set_always_fatal (0);
   theme_expected=pre_init();
 
+  // mainw->foreign is set if we are grabbing an external window
   mainw->foreign=FALSE;
   memset (start_file,0,1);
 
+  // what's my name ?
   capable->myname_full=g_find_program_in_path(argv[0]);
 
   if ((mynsize=readlink(capable->myname_full,fbuff,511))!=-1) {
+    // no. i mean, what's my real name ?
     memset(fbuff+mynsize,0,1);
     g_free(capable->myname_full);
     capable->myname_full=g_strdup(fbuff);
   }
 
+  // what's my short name (without the path) ?
   if ((myname=strrchr(capable->myname_full,'/'))==NULL) capable->myname=g_strdup(capable->myname_full);
   else capable->myname=g_strdup(++myname);
 
@@ -2183,8 +2210,7 @@
 	  continue;
 	}
 	if (!strcmp(charopt,"nothreaddialog")) {
-	  // disable threaded dialog
-	  prefs->show_threaded_dialog=FALSE;
+	  // disable threaded dialog (does nothing now)
 	  continue;
 	}
 	if (!strcmp(charopt,"fxmodesmax")&&optarg!=NULL) {
@@ -2624,9 +2650,11 @@
     layer=weed_plant_new(WEED_PLANT_CHANNEL);
     weed_set_int_value(layer,"clip",mainw->current_file);
     weed_set_int_value(layer,"frame",frame);
-    if (pull_frame(layer,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",tc)) {
-      convert_layer_palette(layer,WEED_PALETTE_RGB24,0);  
-      start_pixbuf=layer_to_pixbuf(layer);
+    if (pull_frame_at_size(layer,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",tc,cfile->hsize,cfile->vsize,
+			   WEED_PALETTE_RGB24)) {
+      convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
+      interp=get_interp_value(prefs->pb_quality);
+      resize_layer(layer,cfile->hsize,cfile->vsize,interp);
     }
     weed_plant_free(layer);
   
@@ -2657,8 +2685,6 @@
     weed_set_int_value(layer,"clip",mainw->current_file);
     weed_set_int_value(layer,"frame",frame);
 
-    
-
     if (pull_frame_at_size(layer,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",tc,width,height,WEED_PALETTE_RGB24)) {
       convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
       interp=get_interp_value(prefs->pb_quality);
@@ -2742,8 +2768,11 @@
     weed_set_int_value(layer,"clip",mainw->current_file);
     weed_set_int_value(layer,"frame",frame);
 
-    if (pull_frame(layer,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",tc)) {
-      convert_layer_palette(layer,WEED_PALETTE_RGB24,0);  
+    if (pull_frame_at_size(layer,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",tc,cfile->hsize,cfile->vsize,
+			   WEED_PALETTE_RGB24)) {
+      convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
+      interp=get_interp_value(prefs->pb_quality);

LiVES-1.4.7.tar.bz2/src/main.h -> LiVES-1.4.8.tar.bz2/src/main.h Changed

@@ -1,6 +1,6 @@
 // main.h
 // LiVES
-// (c) G. Finch (salsaman@xs4all.nl) 2003 - 2010
+// (c) G. Finch (salsaman@xs4all.nl) 2003 - 2011
 // see file ../COPYING for full licensing details
 
 /*  This program is free software; you can redistribute it and/or modify
@@ -152,7 +152,9 @@
 #  define WARN_UNUSED
 #endif
 
-
+#ifdef PRODUCE_LOG
+#define LIVES_LOG "lives.log"
+#endif
 
 /// this struct is used only when physically resampling frames on the disk
 /// we create an array of these and write them to the disk
@@ -645,7 +647,8 @@
 void add_to_playframe (void);
 GtkWidget* create_cdtrack_dialog (gint type, gpointer user_data);
 GtkTextView *create_output_textview(void);
-gchar *choose_file(gchar *dir, gchar *fname, gchar **filt, GtkFileChooserAction act, GtkWidget *extra);
+gchar *choose_file(gchar *dir, gchar *fname, gchar **filt, GtkFileChooserAction act, const char *title, GtkWidget *extra);
+void add_suffix_check(GtkBox *box, const gchar *ext);
 
 
 // dialogs.c
@@ -657,7 +660,8 @@
 void do_error_dialog(const gchar *text);
 void do_error_dialog_with_check(const gchar *text, gint warn_mask_number);
 void do_blocking_error_dialog(const gchar *text);
-void do_error_dialog_with_check_transient(const gchar *text, gboolean is_blocking,gint warn_mask_number, GtkWindow *transient);
+void do_error_dialog_with_check_transient(const gchar *text, gboolean is_blocking,gint warn_mask_number, 
+					  GtkWindow *transient);
 void add_warn_check (GtkBox *box, gint warn_mask_number);
 void do_memory_error_dialog (void);
 void too_many_files(void);
@@ -672,8 +676,10 @@
 void do_auto_dialog(const gchar *text, gint type);
 void do_encoder_acodec_error (void);
 void do_encoder_sox_error(void);
-gboolean rdet_suggest_values (gint width, gint height, gdouble fps, gint fps_num, gint fps_denom, gint arate, gint asigned, gboolean swap_endian, gboolean anr, gboolean ignore_fps);
-gboolean do_encoder_restrict_dialog (gint width, gint height, gdouble fps, gint fps_num, gint fps_denom, gint arate, gint asigned, gboolean swap_endian, gboolean anr);
+gboolean rdet_suggest_values (gint width, gint height, gdouble fps, gint fps_num, gint fps_denom, gint arate, 
+			      gint asigned, gboolean swap_endian, gboolean anr, gboolean ignore_fps);
+gboolean do_encoder_restrict_dialog (gint width, gint height, gdouble fps, gint fps_num, gint fps_denom, 
+				     gint arate, gint asigned, gboolean swap_endian, gboolean anr, gboolean save_all);
 void do_keys_window (void);
 void do_mt_keys_window (void);
 void do_messages_window (void);
@@ -725,6 +731,8 @@
 void do_no_in_vdevs_error(void);
 void do_locked_in_vdevs_error(void);
 void do_do_not_close_d (void);
+void do_set_noclips_error(const char *setname);
+
 
 gboolean process_one (gboolean visible);
 void do_threaded_dialog(gchar *translated_text, gboolean has_cancel);
@@ -758,9 +766,10 @@
 gboolean get_temp_handle(gint index, gboolean create);
 void get_handle_from_info_file(gint index);
 void create_cfile(void);
-void save_file (gboolean existing, gchar *n_file_name);
+void save_file (int clip, int start, int end, const char *filename);
 void play_file (void);
-gboolean save_frame(gint clip, gint frame, const gchar *file_name, gint width, gint height);
+void save_frame (GtkMenuItem *menuitem, gpointer user_data);
+gboolean save_frame_inner(gint clip, gint frame, const gchar *file_name, gint width, gint height, gboolean auto_overwrite);
 void wait_for_stop (const gchar *stop_command);
 void save_clip_values(gint which_file);
 void add_to_recovery_file (const gchar *handle);
@@ -770,7 +779,7 @@
 const gchar *get_deinterlace_string(void);
 
 // saveplay.c backup
-void backup_file(const gchar *filename);
+void backup_file(int clip, int start, int end, const gchar *filename);
 gint save_event_frames(void);
 void write_headers (file *file);
 
@@ -801,9 +810,12 @@
 void load_preview_image(gboolean update_always);
 
 gboolean pull_frame(weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc);
-gboolean pull_frame_at_size (weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc, int width, int height, int target_palette);
-GdkPixbuf *pull_gdk_pixbuf_at_size(gint clip, gint frame, const gchar *image_ext, weed_timecode_t tc, gint width, gint height, GdkInterpType interp);
-GError * lives_pixbuf_save(GdkPixbuf *pixbuf, gchar *fname, lives_image_type_t imgtype, int quality, GError **gerrorptr);
+gboolean pull_frame_at_size (weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc, 
+			     int width, int height, int target_palette);
+GdkPixbuf *pull_gdk_pixbuf_at_size(gint clip, gint frame, const gchar *image_ext, weed_timecode_t tc, 
+				   gint width, gint height, GdkInterpType interp);
+GError * lives_pixbuf_save(GdkPixbuf *pixbuf, gchar *fname, lives_image_type_t imgtype, 
+			   int quality, GError **gerrorptr);
 
 void load_frame_image(gint frame);
 void sensitize(void);
@@ -814,7 +826,6 @@
 void switch_to_file(gint old_file, gint new_file);
 void do_quick_switch (gint new_file);
 void resize (gdouble scale);
-GdkPixbuf *lives_scale_simple (GdkPixbuf *, gint width, gint height);
 gboolean read_file_details(const gchar *file_name, gboolean only_check_for_audio);
 void do_start_messages(void);
 void set_palette_colours (void);
@@ -918,7 +929,8 @@
 gchar *remove_trailing_zeroes(gdouble val);
 void toggle_button_toggle (GtkToggleButton *tbutton);
 void remove_layout_files(GList *lmap);
-gboolean add_lmap_error(lives_lmap_error_t lerror, const gchar *name, gpointer user_data, gint clipno, gint frameno, gdouble atime, gboolean affects_current);
+gboolean add_lmap_error(lives_lmap_error_t lerror, const gchar *name, gpointer user_data, 
+			gint clipno, gint frameno, gdouble atime, gboolean affects_current);
 void clear_lmap_errors(void);
 gboolean prompt_remove_layout_files(void);
 gboolean is_legal_set_name(const gchar *set_name, gboolean allow_dupes);
@@ -932,7 +944,8 @@
 gboolean check_for_lock_file(const gchar *set_name, gint type);
 void g_list_free_strings(GList *list);
 void gtk_tooltips_copy(GtkWidget *dest, GtkWidget *source);
-void adjustment_configure(GtkAdjustment *adjustment, gdouble value, gdouble lower, gdouble upper, gdouble step_increment, gdouble page_increment, gdouble page_size);
+void adjustment_configure(GtkAdjustment *adjustment, gdouble value, gdouble lower, gdouble upper, 
+			  gdouble step_increment, gdouble page_increment, gdouble page_size);
 gboolean create_event_space(gint length_in_eventsb);
 void add_to_recent(const gchar *filename, gdouble start, gint frames, const gchar *file_open_params);
 gint verhash (gchar *version);
@@ -983,7 +996,7 @@
 
 // plugins.c
 GList *get_external_window_hints(lives_rfx_t *rfx);
-gboolean check_encoder_restrictions (gboolean get_extension, gboolean user_audio);
+gboolean check_encoder_restrictions (gboolean get_extension, gboolean user_audio, gboolean save_all);
 
 //callbacks.c
 void lives_exit (void);
@@ -1048,4 +1061,8 @@
 #define LIVES_TV_CHANNEL1 "http://www.serverwillprovide.com/sorteal/livestvclips/livestv.ogm"
 
 
+// round up to next multiple of b
+#define CEIL(a,b) ((int)(((double)a+(double)b-.000000001)/((double)b))*b)
+
+
 #endif // #ifndef HAS_MAIN_H

LiVES-1.4.7.tar.bz2/src/mainwindow.h -> LiVES-1.4.8.tar.bz2/src/mainwindow.h Changed

@@ -1,6 +1,6 @@
 // mainwindow.h
 // LiVES (lives-exe)
-// (c) G. Finch <salsaman@xs4all.nl> 2003 - 2010
+// (c) G. Finch <salsaman@xs4all.nl> 2003 - 2011
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -55,6 +55,8 @@
 #define EFFECT_NONE 0
 #define GU641 ((guint64)1)
 
+#define MAX_FX_THREADS 65536
+
 
 /// max ext_cntl + 1
 #define MAX_EXT_CNTL 2
@@ -319,7 +321,6 @@
   /////////////////////////////////////////////////
 
   // end of static-ish info
-  gboolean save_all;
   gchar first_info_file[256];
   gboolean leave_files;
   gboolean was_set;
@@ -350,6 +351,7 @@
   gint64 deltaticks; ///< deltaticks for scratching
   gint64 firstticks; ///< ticks when audio started playing (for non-realtime audio plugins)
   gint64 stream_ticks;  ///< ticks since first frame sent to playback plugin
+  gint64 last_display_ticks; /// currticks when last display was shown (used for fixed fps)
 
   gboolean size_warn; ///< warn the user that incorrectly sized frames were found
 
@@ -442,6 +444,8 @@
   gulong hnd_id;
   gulong loop_cont_func;
   gulong mute_audio_func;
+  gulong fullscreen_cb_func;
+  gulong sepwin_cb_func;
 
   // for jack transport
   gboolean jack_can_stop;
@@ -543,6 +547,7 @@
   GtkWidget *sticky;
   GtkWidget *showfct;
   GtkWidget *showsubs;
+  GtkWidget *letter;
   GtkWidget *aload_subs;
   GtkWidget *load_subs;
   GtkWidget *erase_subs;
@@ -930,6 +935,10 @@
 
   gchar vpp_defs_file[PATH_MAX];
 
+  int log_fd;
+
+  gboolean jack_trans_poll;
+
 } mainwindow;
 
 GdkCursor *hidden_cursor;

LiVES-1.4.7.tar.bz2/src/multitrack.c -> LiVES-1.4.8.tar.bz2/src/multitrack.c Changed

@@ -386,32 +386,50 @@
 
 
 static void renumber_from_backup_layout_numbering(lives_mt *mt) {
-  int fd,count=1,vari,offs=0;
+  // this is used only for crash recovery
+
+  // layout_numbering simply maps our clip handles to clip numbers in the current layout
+  // we assume the order hasnt changed (it cant) and there are no gaps (we have just reloaded)
+
+  //but the numbering mayhave changed (for example we started last time in mt mode, this time in ce mode)
+
+  int fd,vari,clipn,offs;
   gdouble vard;
   gchar *aload_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,getuid(),getgid(),getpid());
-
-  if (prefs->startup_interface==STARTUP_MT) count++;
+  gboolean isfirst=TRUE;
+  char buf[256];
 
   fd=open(aload_file,O_RDONLY);
 
   if (fd!=-1) {
     while (1) {
-      if (read(fd,&vari,sizint)>0) {
-	renumbered_clips[vari+offs]=count;
-	if (read(fd,&vard,sizdbl)>0) {
-	  lfps[count]=vard;
-	  if (read(fd,&vari,sizint)>0) {
-	    // skip the handle
-	    lseek(fd,vari,SEEK_CUR);
+      if (read(fd,&clipn,sizint)==sizint) {
+	if (isfirst) offs=-clipn+1;
+	else isfirst=FALSE;
+	if (read(fd,&vard,sizdbl)==sizdbl) {
+
+	  if (read(fd,&vari,sizint)==sizint) {
+	    // compare the handle - assume clip ordering has not changed
+	    if (vari>255) vari=255;
+	    if (read(fd,buf,vari)==vari) {
+	      memset(buf+vari,0,1);
+	      while (mainw->files[clipn+offs]!=NULL&&strcmp(mainw->files[clipn+offs]->handle,buf)) {
+		offs++;
+	      }
+	      if (mainw->files[clipn+offs]==NULL) break;
+	      // got a match - index the current clip order -> clip order in layout
+	      renumbered_clips[clipn]=clipn+offs;
+	      // lfps contains the fps at the time of the crash
+	      lfps[clipn+offs]=vard;
+	    }
+	    else break;
 	  }
 	  else break;
 	}
 	else break;
       }
       else break;
-      count++;
     }
-
     close(fd);
   }
 }
@@ -420,10 +438,16 @@
 
 
 
-static void save_mt_autoback(lives_mt *mt) {
+static void save_mt_autoback(lives_mt *mt, int64_t stime) {
+  // auto backup of the current layout
+
+  // this is called from an idle funtion - if the specified amount of time has passed and
+  // the clip has been altered
+
+  struct timeval otv;
+
   int fd;
   gchar *asave_file=g_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,getuid(),getgid(),getpid());
-  GtkWidget *dummyd;
   lives_mt_poly_state_t poly_state;
 
   mt_desensitise(mt);
@@ -431,19 +455,6 @@
   // flush any pending events
   while (g_main_context_iteration(NULL,FALSE));
 
-  // create a dummy "modal" dialog -> the threaded window should be modal
-  // but it seems on some systems modality is per-thread !
-  dummyd = gtk_dialog_new ();
-  gtk_window_set_default_size(GTK_WINDOW(dummyd),0,0);
-  gtk_window_set_decorated(GTK_WINDOW(dummyd),FALSE);
-  gtk_window_set_modal (GTK_WINDOW (dummyd), TRUE);
-  gtk_window_set_keep_below (GTK_WINDOW (dummyd), TRUE);
-  gtk_window_set_transient_for (GTK_WINDOW (dummyd), GTK_WINDOW(mt->window));
-  gtk_widget_show(dummyd);
-
-  // show dummy window
-  while (g_main_context_iteration(NULL,FALSE));
-
   fd=creat(asave_file,S_IRUSR|S_IWUSR);
   add_markers(mt,mt->event_list);
   do_threaded_dialog(_("Auto backup"),FALSE);
@@ -460,15 +471,20 @@
   mt_sensitise(mt);
   mt->poly_state=poly_state;
 
-  gtk_widget_destroy(dummyd);
+  mt->auto_changed=FALSE;
+
+  if (stime==0) {
+    gettimeofday(&otv, NULL);
+    stime=otv.tv_sec;
+  }
+
+  mt->auto_back_time=stime;
 
 }
 
 
 
 static gboolean mt_auto_backup(gpointer user_data) {
-  // can't use any gtk+ functions here, because of gtk+
-  // threading problems
 
   struct timeval otv;
   int64_t stime,diff;
@@ -494,9 +510,7 @@
 
   diff=stime-mt->auto_back_time;
   if (diff>=prefs->mt_auto_back) {
-    save_mt_autoback(mt);
-    mt->auto_changed=FALSE;
-    mt->auto_back_time=stime;
+    save_mt_autoback(mt,stime);
   }
 
 
@@ -557,7 +571,7 @@
       g_free(aload_file);
       mt_init_tracks(mt,TRUE);
       remove_markers(mt->event_list);
-      save_mt_autoback(mt);
+      save_mt_autoback(mt,0);
     }
     else {
       // failed to load
@@ -598,6 +612,7 @@
     mt_load_recovery_layout(mainw->multitrack);
     mainw->multitrack->auto_reloading=FALSE;
     mt_sensitise(mainw->multitrack);
+    mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
   }
   mainw->recoverable_layout=FALSE;
 
@@ -1059,14 +1074,13 @@
 
   res=make_param_box(GTK_VBOX (mt->fx_box), mt->current_rfx);
 
-  if (!res||mt->fx_params_label==NULL) {
-    mt->fx_params_label=gtk_label_new(ltext);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(mt->fx_params_label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (mt->fx_box), mt->fx_params_label, FALSE, FALSE, 0);
+  mt->fx_params_label=gtk_label_new(ltext);
+
+  if (palette->style&STYLE_1) {
+    gtk_widget_modify_fg(mt->fx_params_label, GTK_STATE_NORMAL, &palette->normal_fore);
   }
-  else gtk_label_set_text(GTK_LABEL(mt->fx_label),ltext);
+  gtk_box_pack_start (GTK_BOX (mt->fx_box), mt->fx_params_label, FALSE, FALSE, 0);
+
   g_free(ltext);
 
   gtk_widget_show_all(mt->fx_base_box);
@@ -1195,12 +1209,12 @@
   GtkWidget *labelbox,*ahbox,*eventbox,*oeventbox,*checkbutton=NULL;
   gint hidden=0;
   weed_timecode_t tc;
-  gdouble pos;
 
   if (cfile->achans>0) {
     for (i=0;i<g_list_length(mt->audio_draws);i++) {
       eventbox=g_list_nth_data(mt->audio_draws,i);
-      if ((oeventbox=g_object_get_data(G_OBJECT(eventbox),"owner"))!=NULL) hidden=!GPOINTER_TO_INT(g_object_get_data(G_OBJECT(oeventbox),"expanded"));
+      if ((oeventbox=g_object_get_data(G_OBJECT(eventbox),"owner"))!=NULL) 
+	hidden=!GPOINTER_TO_INT(g_object_get_data(G_OBJECT(oeventbox),"expanded"));
       if (hidden==0) hidden=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"));
       if (hidden==0) {
 	labelbox=g_object_get_data(G_OBJECT(eventbox),"labelbox");
@@ -1210,12 +1224,13 @@
 	  if (ahbox!=NULL) gtk_widget_set_state(ahbox,GTK_STATE_SELECTED);
 	  gtk_widget_set_sensitive (mt->jumpback, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
 	  gtk_widget_set_sensitive (mt->jumpnext, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
-	  if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mt->select_track))) gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),FALSE);
+	  if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mt->select_track))) 
+	    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),FALSE);
 	  gtk_widget_set_sensitive(mt->select_track,FALSE);
 	  gtk_widget_set_sensitive(mt->cback_audio,FALSE);
-	  if (mt->is_ready) pos=GTK_RULER (mt->timeline)->position;

LiVES-1.4.7.tar.bz2/src/multitrack.h -> LiVES-1.4.8.tar.bz2/src/multitrack.h Changed

LiVES-1.4.7.tar.bz2/src/omc-learn.c -> LiVES-1.4.8.tar.bz2/src/omc-learn.c Changed

@@ -820,11 +820,10 @@
     if (!strcmp(macro_text,omc_macros[i].macro_text)) break;
   }
 
-  if (i>0) {
-    mnode->macro=i;
-    omc_learn_link_params(mnode);
-    omc_macro_row_add_params(mnode,row,omclw);
-  }
+  mnode->macro=i;
+  omc_learn_link_params(mnode);
+  omc_macro_row_add_params(mnode,row,omclw);
+
 }
 
 
@@ -1870,7 +1869,7 @@
 
   // the str_type is one of JS_AXIS, JS_BUTTON, MIDI_CONTROLLER, MIDI_KEY, etc.
 
-  // idx is -1, excpet for JS_BUTTON and JS_AXIS where it can be used
+  // idx is -1, except for JS_BUTTON and JS_AXIS where it can be used
 
   // the string is first transformed into
   // signifier and value
@@ -1969,7 +1968,6 @@
     break;
   case OMC_JS_BUTTON:
     // display note and allow it to be matched
-    nfixed=3;
     mnode=omc_match_sig(str_type,idx,string);
      
     if (mnode==NULL||mnode->macro==-1) {
@@ -1988,17 +1986,24 @@
 
 
 
+// here we process a string which is formed of (supertype) (type) [(idx)] [(values)]
+// eg "val_for_js js_button idx_1  1"  => "2 3 1
 
+// in learn mode we store the sting + its meaning
 
+// in playback mode, we match the string with our database, and then convert/append the variables
 
-
-void omc_process_string(gint supertype, const gchar *string, gboolean learn, omclearn_w *omclw) {
+gboolean omc_process_string(gint supertype, const gchar *string, gboolean learn, omclearn_w *omclw) {
   // only need to set omclw if learn is TRUE
+  
+  // returns TRUE if we learn new, or if we carry out an action
+  // retruns FALSE otherwise
 
+  gboolean ret=FALSE;
   int type=0,idx=-1;
   lives_omc_match_node_t *mnode;
 
-  if (string==NULL)  return;
+  if (string==NULL)  return FALSE;
 
   switch (supertype) {
   case OMC_JS:
@@ -2018,15 +2023,38 @@
     if (learn) {
       // pass to learner
       mnode=omc_learn(string,type,idx,omclw);
-      if (mnode!=NULL) omc_node_list=g_slist_append(omc_node_list,mnode);
+      if (mnode!=NULL) {
+	ret=TRUE;
+	omc_node_list=g_slist_append(omc_node_list,mnode);
+      }
     }
     else {
       OSCbuf *oscbuf=omc_learner_decode(supertype,idx,string);
-      //g_print("decode str %s\n",string);
-      if (oscbuf!=NULL) lives_osc_act(oscbuf);
+
+      // if not playing, the only commands we allow are:
+      // /video/play
+      // /clip/foreground/retrigger
+      // and enabling a generator
+
+      // basically only messages which will trigger start of playback
+
+
+      // further checks are performed when enabling/toggling an effect to see whether it is a generator
+
+      if (oscbuf!=NULL) {
+	if (mainw->playing_file==-1
+	    &&strcmp(oscbuf->buffer,"/video/play")
+	    &&strcmp(oscbuf->buffer,"/clip/foreground/retrigger")
+	    &&strcmp(oscbuf->buffer,"/effect_key/enable")
+	    &&strcmp(oscbuf->buffer,"/effect_key/toggle")
+	    ) return FALSE;
+	
+	lives_osc_act(oscbuf);
+	ret=TRUE;
+      }
     }
   }
-  
+  return ret;
 }
 
 
@@ -2314,7 +2342,7 @@
 
 /////////////////////////////////////
 void on_midi_save_activate (GtkMenuItem *menuitem, gpointer user_data) {
-  gchar *save_file=choose_file(NULL,NULL,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,NULL);
+  gchar *save_file=choose_file(NULL,NULL,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
   int fd;
   GSList *slist=omc_node_list;
   size_t srchlen;
@@ -2415,7 +2443,7 @@
   lives_omc_match_node_t *mnode;
   lives_omc_macro_t omacro;
   gchar tstring[512];
-  int nnodes,i,macro,nvars,type=0,supertype,j,idx=-1;
+  int nnodes,i,macro,nvars,supertype,j,idx=-1;
   gchar *srch;
   gchar *msg;
 
@@ -2424,7 +2452,7 @@
   gchar *tmp;
 #endif 
 
-  if (user_data==NULL) load_file=choose_file(NULL,NULL,NULL,GTK_FILE_CHOOSER_ACTION_OPEN,NULL);
+  if (user_data==NULL) load_file=choose_file(NULL,NULL,NULL,GTK_FILE_CHOOSER_ACTION_OPEN,NULL,NULL);
   else load_file=g_strdup(user_data);
 
   if (load_file==NULL) return;
@@ -2517,13 +2545,11 @@
       supertype=js_msg_type(srch);
     case OMC_JS_BUTTON:
     case OMC_JS_AXIS:
-      type=supertype;
       idx=js_index(srch);
       break;
 #endif
 #ifdef OMC_MIDI_IMPL
     case OMC_MIDI:
-      type=midi_msg_type(srch);
       idx=-1;
 
       // cut first value (supertype) as we will be added back in match_node_new

LiVES-1.4.7.tar.bz2/src/omc-learn.h -> LiVES-1.4.8.tar.bz2/src/omc-learn.h Changed

LiVES-1.4.7.tar.bz2/src/osc.c -> LiVES-1.4.8.tar.bz2/src/osc.c Changed

@@ -35,6 +35,9 @@
 
 static lives_osc *livesOSC=NULL;
 
+
+static gboolean via_shortcut=FALSE;
+
 #define OSC_STRING_SIZE 256
 
 #define FX_MAX FX_KEYS_MAX_VIRTUAL-1
@@ -705,7 +708,9 @@
 }
 
 void lives_osc_cb_fx_enable(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  // if via_shortcut and not playing, we ignore unless a generator starts (which starts playback)
 
+  int count;
   int effect_key;
   gint grab=mainw->last_grabable_effect;
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
@@ -713,6 +718,12 @@
   lives_osc_parse_int_argument(vargs,&effect_key);
 
   if (!(mainw->rte&(GU641<<(effect_key-1)))) {
+    if (mainw->playing_file==-1&&via_shortcut) {
+      weed_plant_t *filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+      if (filter==NULL) return lives_osc_notify_failure();
+      count=enabled_in_channels(filter, FALSE);
+      if (count!=0) return lives_osc_notify_failure(); // is no generator
+    }
     if (!mainw->osc_block) rte_on_off_callback(NULL,NULL,0,0,GINT_TO_POINTER(effect_key));
   }
   mainw->last_grabable_effect=grab;
@@ -733,11 +744,20 @@
 
 
 void lives_osc_cb_fx_toggle(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  // if not playing and via_shortcut, see if fx key points to generator
 
+  int count;
   int effect_key;
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
   if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
+
+  if (!(mainw->rte&(GU641<<(effect_key-1)))&&mainw->playing_file==-1&&via_shortcut) {
+    weed_plant_t *filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+    if (filter==NULL) return lives_osc_notify_failure();
+    count=enabled_in_channels(filter, FALSE);
+    if (count!=0) return lives_osc_notify_failure(); // is no generator
+  }
   if (!mainw->osc_block) rte_on_off_callback(NULL,NULL,0,0,GINT_TO_POINTER(effect_key));
   if (prefs->omc_noisy) lives_osc_notify_success(NULL);
 }
@@ -1450,9 +1470,7 @@
   }
 
   if (!(notify_socket=OpenHTMSocket (host,port,TRUE))) g_printerr ("Unable to open notify socket !\n");
-  else if (prefs->omc_noisy) {
-    lives_osc_notify_success(NULL);
-  }
+  prefs->omc_noisy=FALSE; // default for confirms is OFF
 
 }
 
@@ -2060,8 +2078,6 @@
   int clip=current_file;
   char name[OSC_STRING_SIZE];
 
-  file *sfile;
-
   if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
 
   if (lives_osc_check_arguments (arglen,vargs,"si",FALSE)) { 
@@ -2077,10 +2093,12 @@
 
   if (clip<1||clip>MAX_FILES||mainw->files[clip]==NULL) return lives_osc_notify_failure();
 
-  sfile=mainw->files[clip];
-
+  mainw->current_file=clip;
   on_rename_set_name(NULL,(gpointer)name);
 
+  if (clip==current_file) set_main_title(name,0);
+  else mainw->current_file=current_file;
+
   if (prefs->omc_noisy) {
     lives_osc_notify_success(name);
   }
@@ -2167,7 +2185,7 @@
   if (frame<1||frame>sfile->frames||(sfile->clip_type!=CLIP_TYPE_DISK&&sfile->clip_type!=CLIP_TYPE_FILE)) 
     return lives_osc_notify_failure();
 
-  retval=save_frame(clip,frame,fname,width,height);
+  retval=save_frame_inner(clip,frame,fname,width,height,TRUE);
 
   if (retval) lives_osc_notify_success(NULL);
   else lives_osc_notify_failure();
@@ -2330,7 +2348,6 @@
 void lives_osc_cb_clip_encodeas(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char fname[OSC_STRING_SIZE];
 
-
   if (mainw->playing_file>-1||mainw->current_file<1) return lives_osc_notify_failure();
 
   if (!lives_osc_check_arguments (arglen,vargs,"sii",FALSE)) { 
@@ -2353,10 +2370,8 @@
     return;
   }
 
-  mainw->save_all=TRUE;
-
   mainw->osc_auto=TRUE;
-  save_file(TRUE,fname);
+  save_file(mainw->current_file,1,cfile->frames,fname);
   lives_osc_notify_success(NULL);
   mainw->osc_auto=FALSE;
 
@@ -4629,9 +4644,6 @@
 /* get a packet */
 static int lives_osc_get_packet(lives_osc *o) {
   //OSCTimeTag tag;
-  struct timeval tv;
-  tv.tv_sec=0;
-  tv.tv_usec = 0;
   
   /* see if there is something to read , this is effectivly NetworkPacketWaiting */
   // if(ioctl( o->sockfd, FIONREAD, &bytes,0 ) == -1) return 0;
@@ -4681,7 +4693,9 @@
   
   OSCAcceptPacket(packet);
 
+  via_shortcut=TRUE;
   OSCBeProductiveWhileWaiting();
+  via_shortcut=FALSE;
 
   return TRUE;
 }

LiVES-1.4.7.tar.bz2/src/paramspecial.c -> LiVES-1.4.8.tar.bz2/src/paramspecial.c Changed

@@ -21,10 +21,12 @@
 #include "resample.h"
 #include "effects-weed.h"
 #include "support.h"
+#include "paramwindow.h"
 
 static lives_special_aspect_t aspect;
 static lives_special_framedraw_rect_t framedraw;
 static GList *fileread;
+static GList *passwd_widgets;
 
 // TODO - rewrite all of this more sensibly
 
@@ -41,6 +43,7 @@
   framedraw.added=FALSE;
   mergealign.start_param=mergealign.end_param=-1;
   mergealign.start_widget=mergealign.end_widget=NULL;
+  passwd_widgets=NULL;
   fileread=NULL;
 }
 
@@ -153,6 +156,13 @@
   else if (!strcmp (array[0],"fileread")) {
     fileread=g_list_append(fileread,GINT_TO_POINTER(atoi(array[1])));
   }
+  else if (!strcmp (array[0],"password")) {
+    int idx=atoi(array[1]);
+    passwd_widgets=g_list_append(passwd_widgets,GINT_TO_POINTER(idx));
+
+    // ensure we get an entry and not a text_view
+    if ((gint)rfx->params[idx].max>RFX_TEXT_MAGIC) rfx->params[idx].max=(gdouble)RFX_TEXT_MAGIC;
+  }
 
   g_strfreev (array);
   return extra_width;
@@ -176,6 +186,11 @@
 }
 
 
+static void passwd_toggle_vis(GtkToggleButton *b, gpointer entry) {
+  gtk_entry_set_visibility(GTK_ENTRY(entry),gtk_toggle_button_get_active(b));
+}
+
+
 void check_for_special (lives_param_t *param, gint num, GtkBox *pbox, lives_rfx_t *rfx) {
   GtkWidget *checkbutton;
   GtkWidget *hbox;
@@ -197,94 +212,96 @@
     gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),0.);
     g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw);
   }
-  if (num==framedraw.xend_param) {
-    framedraw.xend_widget=param->widgets[0];
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->hsize);
-    g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw);
-  }
-  if (num==framedraw.yend_param) {
-    framedraw.yend_widget=param->widgets[0];
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->vsize);
-    g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw);
+  if (mainw->current_file>-1) {
+    if (num==framedraw.xend_param) {
+      framedraw.xend_widget=param->widgets[0];
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->hsize);
+      g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw);
+    }
+    if (num==framedraw.yend_param) {
+      framedraw.yend_widget=param->widgets[0];
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->vsize);
+      g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw);
   }
-  if (framedraw.xstart_widget!=NULL&&framedraw.ystart_widget!=NULL&&framedraw.xend_widget!=NULL&&framedraw.yend_widget!=NULL&&!framedraw.added) {
-    if (mainw->multitrack==NULL) {
-      framedraw_connect(&framedraw,cfile->hsize,cfile->vsize,rfx); // turn passive preview->active
-      framedraw_add_reset(GTK_VBOX(GTK_WIDGET(pbox)),&framedraw);
+    if (framedraw.xstart_widget!=NULL&&framedraw.ystart_widget!=NULL&&framedraw.xend_widget!=NULL&&framedraw.yend_widget!=NULL&&!framedraw.added) {
+      if (mainw->multitrack==NULL) {
+	framedraw_connect(&framedraw,cfile->hsize,cfile->vsize,rfx); // turn passive preview->active
+	framedraw_add_reset(GTK_VBOX(GTK_WIDGET(pbox)),&framedraw);
+      }
+      else {
+	mainw->framedraw_image=mainw->image274;
+	
+	// create a blank bitmap mask
+	if (mainw->framedraw_bitmap!=NULL) {
+	  gdk_pixmap_unref (mainw->framedraw_bitmap);
+	}
+	
+	mainw->framedraw_bitmap = gdk_pixmap_new (NULL, cfile->hsize, cfile->vsize, 1);
+	framedraw_add_label(GTK_VBOX(GTK_WIDGET(pbox)));
+	
+	if (mainw->framedraw_bitmapgc!=NULL) {
+	  g_object_unref (mainw->framedraw_bitmapgc);
+	}
+	
+	if (mainw->framedraw_bitmap!=NULL) mainw->framedraw_bitmapgc=gdk_gc_new (mainw->framedraw_bitmap);
+	
+      }
+      framedraw.added=TRUE;
     }
-    else {
-      mainw->framedraw_image=mainw->image274;
+    
+    
+    if (num==aspect.width_param) {
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->hsize);
+      aspect.width_func=g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed",
+						G_CALLBACK (after_aspect_width_changed),
+						NULL);
+      aspect.width_widget=param->widgets[0];
+    }
+    if (num==aspect.height_param) {
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->vsize);
+      aspect.height_func=g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed",
+						 G_CALLBACK (after_aspect_height_changed),
+						 NULL);
       
-      // create a blank bitmap mask
-      if (mainw->framedraw_bitmap!=NULL) {
-	gdk_pixmap_unref (mainw->framedraw_bitmap);
-      }
+      box = gtk_hbox_new (FALSE, 10);
+      gtk_box_pack_start (GTK_BOX (GTK_WIDGET (pbox)), box, TRUE, FALSE, 0);
       
-      mainw->framedraw_bitmap = gdk_pixmap_new (NULL, cfile->hsize, cfile->vsize, 1);
-      framedraw_add_label(GTK_VBOX(GTK_WIDGET(pbox)));
       
-      if (mainw->framedraw_bitmapgc!=NULL) {
-	g_object_unref (mainw->framedraw_bitmapgc);
-      }
       
-      if (mainw->framedraw_bitmap!=NULL) mainw->framedraw_bitmapgc=gdk_gc_new (mainw->framedraw_bitmap);
       
-    }
-    framedraw.added=TRUE;
-  }
-  
-  if (num==aspect.width_param) {
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->hsize);
-    aspect.width_func=g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed",
-					      G_CALLBACK (after_aspect_width_changed),
-					      NULL);
-    aspect.width_widget=param->widgets[0];
-  }
-  if (num==aspect.height_param) {
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->vsize);
-    aspect.height_func=g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed",
-					       G_CALLBACK (after_aspect_height_changed),
-						 NULL);
+      checkbutton = gtk_check_button_new ();
+      gtk_tooltips_set_tip (mainw->tooltips, checkbutton, (_("Maintain aspect ratio of original frame")), NULL);
+      eventbox=gtk_event_box_new();
+      gtk_tooltips_copy(eventbox,checkbutton);
+      label=gtk_label_new_with_mnemonic (_("Maintain _Aspect Ratio"));
       
-    box = gtk_hbox_new (FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (GTK_WIDGET (pbox)), box, TRUE, FALSE, 0);
       
-
-
-
-    checkbutton = gtk_check_button_new ();
-    gtk_tooltips_set_tip (mainw->tooltips, checkbutton, (_("Maintain aspect ratio of original frame")), NULL);
-    eventbox=gtk_event_box_new();
-    gtk_tooltips_copy(eventbox,checkbutton);
-    label=gtk_label_new_with_mnemonic (_("Maintain _Aspect Ratio"));
-
-
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      checkbutton);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+      gtk_container_add(GTK_CONTAINER(eventbox),label);
+      g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
+			G_CALLBACK (label_act_toggle),
+			checkbutton);
+      if (palette->style&STYLE_1) {
+	gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
+	gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
+	gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+      }
+      
+      gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton);
+      
+      hbox = gtk_hbox_new (FALSE, 10);
+      gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 10);
+      add_fill_to_box(GTK_BOX(hbox));
+      gtk_box_pack_start (GTK_BOX (hbox), checkbutton, FALSE, FALSE, 10);
+      gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+      add_fill_to_box(GTK_BOX(hbox));
+      GTK_WIDGET_SET_FLAGS (checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), TRUE);
+      aspect.checkbutton=checkbutton;
+      aspect.height_widget=param->widgets[0];
     }
-

LiVES-1.4.7.tar.bz2/src/paramwindow.c -> LiVES-1.4.8.tar.bz2/src/paramwindow.c Changed

@@ -581,7 +581,8 @@
     g_signal_connect_after (GTK_OBJECT (spinbuttonw), "value_changed",
 			    G_CALLBACK (gen_width_changed),
 			    tmpl);
-    gen_width_changed(GTK_SPIN_BUTTON(spinbuttonw),NULL);
+    weed_leaf_delete(tmpl,"host_width"); // force a reset
+    gen_width_changed(GTK_SPIN_BUTTON(spinbuttonw),tmpl);
 
     label=gtk_label_new_with_mnemonic(_("_Height"));
     if (palette->style&STYLE_1) {
@@ -606,7 +607,8 @@
     g_signal_connect_after (GTK_OBJECT (spinbuttonh), "value_changed",
 			    G_CALLBACK (gen_height_changed),
 			    tmpl);
-    gen_height_changed(GTK_SPIN_BUTTON(spinbuttonh),NULL);
+    weed_leaf_delete(tmpl,"host_height"); // force a reset
+    gen_height_changed(GTK_SPIN_BUTTON(spinbuttonh),tmpl);
 
   }
 
@@ -734,6 +736,9 @@
 
   gboolean has_param;
 
+
+  // TODO - remove this and check in rfx / realfx activate
+
   if (rfx->num_in_channels>0) {
     if (menuitem!=NULL&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES)&&(mainw->xlays=layout_frame_is_affected(mainw->current_file,1))!=NULL) {
       if (!do_layout_alter_frames_warning()) {
@@ -1130,7 +1135,7 @@
       if (!strncmp (g_list_nth_data (hints,i),lstring,7)) {
 	layout=g_list_append (layout,g_strdup((gchar *)g_list_nth_data (hints,i)+7));
       }
-      else if (!strncmp (g_list_nth_data (hints,i),sstring,8)&&mainw->current_file>0) {
+      else if (!strncmp (g_list_nth_data (hints,i),sstring,8)) {
 	add_to_special((gchar *)g_list_nth_data (hints,i)+8,rfx);
       }
     }
@@ -1799,12 +1804,10 @@
 
   }
   
-  if (mainw->current_file>0) {
-    // see if there were any 'special' hints
-    //mainw->block_param_updates=FALSE; // need to keep blocked until last param widget has been created
-    check_for_special (param,pnum,GTK_BOX(GTK_WIDGET(box)->parent),rfx);
-    //mainw->block_param_updates=TRUE;
-  }
+  // see if there were any 'special' hints
+  //mainw->block_param_updates=FALSE; // need to keep blocked until last param widget has been created
+  check_for_special (param,pnum,GTK_BOX(GTK_WIDGET(box)->parent),rfx);
+  //mainw->block_param_updates=TRUE;
 
   g_free (name);
   return was_num;
@@ -2398,6 +2401,10 @@
 
 
 gboolean after_param_text_focus_changed (GtkWidget *hbox, GtkWidget *child, lives_rfx_t *rfx) {
+  // for non realtime effects
+  // we don't usually want to run the trigger every single time the user presses a key in a text widget
+  // so we only update when the user clicks OK or focusses out of the widget
+
   GtkWidget *textwidget;
 
   if (mainw->multitrack!=NULL) {
@@ -2405,7 +2412,10 @@
       gtk_window_remove_accel_group(GTK_WINDOW(mainw->multitrack->window),mainw->multitrack->accel_group);
     else
       gtk_window_add_accel_group(GTK_WINDOW(mainw->multitrack->window),mainw->multitrack->accel_group);
-    return FALSE;
+
+    // effects and generators make their own arrangements to be updated in multitrack
+    // rfx scraps don't  (for example vpp advanced in prefs)
+    if (rfx->status!=RFX_STATUS_SCRAP) return FALSE;
   }
 
   if (hbox!=NULL) {

LiVES-1.4.7.tar.bz2/src/plugins.c -> LiVES-1.4.8.tar.bz2/src/plugins.c Changed

@@ -29,7 +29,7 @@
 #include "rfx-builder.h"
 #include "paramwindow.h"
 
-const char *anames[AUDIO_CODEC_MAX]={"mp3","pcm","mp2","vorbis","AC3","AAC","AMR_NB","raw",""};
+const char *anames[AUDIO_CODEC_MAX]={"mp3","pcm","mp2","vorbis","AC3","AAC","AMR_NB","raw","wma2",""};
 
 static gboolean list_plugins;
 
@@ -98,7 +98,6 @@
   }
   
   if (!count) {
-    threaded_dialog_spin();
     g_printerr (_("Plugin timed out on message %s\n"),command);
     g_free (outfile);
     threaded_dialog_spin();
@@ -110,7 +109,6 @@
   unlink (outfile);
   threaded_dialog_spin();
   g_free (outfile);
-  threaded_dialog_spin();
   memset (buffer+bytes,0,1);
 
 #ifdef DEBUG_PLUGINS
@@ -134,7 +132,6 @@
       else g_free(buf);
     }
   }
-  threaded_dialog_spin();
   g_strfreev (array);
   threaded_dialog_spin();
   return list;
@@ -193,7 +190,6 @@
   else com=g_strdup (request);
   list_plugins=FALSE;
   reslist=get_plugin_result (com,delim,allow_blanks);
-  threaded_dialog_spin();
   g_free(com);
   threaded_dialog_spin();
   return reslist;
@@ -240,7 +236,6 @@
   }
   list_plugins=TRUE;
   pluglist=get_plugin_result (com,"|",FALSE);
-  threaded_dialog_spin();
   g_free(com);
   threaded_dialog_spin();
   return pluglist;
@@ -515,7 +510,9 @@
       mainw->vpp->fixed_fps_numer=0;
     }
 
-    if (mainw->vpp->fixed_fpsd>0.&&(mainw->fixed_fpsd>0.||!((*mainw->vpp->set_fps) (mainw->vpp->fixed_fpsd)))) {
+    if (mainw->vpp->fixed_fpsd>0.&&(mainw->fixed_fpsd>0.||
+				    (mainw->vpp->set_fps!=NULL&&
+				     !((*mainw->vpp->set_fps) (mainw->vpp->fixed_fpsd))))) {
       do_vpp_fps_error();
       mainw->error=TRUE;
       mainw->vpp->fixed_fpsd=-1.;
@@ -678,7 +675,7 @@
   }
 
   // get filename
-  save_file=choose_file(NULL,NULL,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,NULL);
+  save_file=choose_file(NULL,NULL,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
   if (save_file==NULL) return;
 
   // save
@@ -943,8 +940,20 @@
   // extra params
 
   if (tmpvpp->get_rfx!=NULL) {
+    GtkWidget *vbox=gtk_vbox_new (FALSE, 0);
+    GtkWidget *scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
+    gtk_widget_set_size_request (scrolledwindow, RFX_WINSIZE_H, RFX_WINSIZE_V/2);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+    gtk_widget_show (scrolledwindow);
+    
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
+
+    gtk_widget_show (vbox);
+    gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), vbox);
+
     com=g_strdup_printf("echo -e \"%s\"",(*tmpvpp->get_rfx)());
-    plugin_run_param_window(com,GTK_VBOX(dialog_vbox),&(vppa->rfx));
+
+    plugin_run_param_window(com,GTK_VBOX(vbox),&(vppa->rfx));
     g_free(com);
     if (tmpvpp->extra_argv!=NULL&&tmpvpp->extra_argc>0) {
       // update with defaults
@@ -1039,7 +1048,6 @@
   int i;
   int *palette_list;
   _vid_playback_plugin *vpp;
-  gboolean needs_restart=FALSE;
 
   if (handle==NULL) {
     gchar *msg=g_strdup_printf (_("\n\nFailed to open playback plugin %s\nError was %s\n"),plugname,dlerror());
@@ -1213,7 +1221,6 @@
   }
 
   if (vpp->get_audio_fmts!=NULL&&mainw->is_ready) vpp->audio_codec=get_best_audio(vpp);
-
   if (prefsw!=NULL) prefsw_set_astream_settings(vpp);
 
   if (!using) return vpp;
@@ -1240,7 +1247,8 @@
   if (vpp->set_yuv_palette_clamping!=NULL) (*vpp->set_yuv_palette_clamping)(vpp->YUV_clamping);
 
   if (vpp->get_fps_list!=NULL) {
-    if (mainw->fixed_fpsd>0.||(vpp->fixed_fpsd>0.&&!((*vpp->set_fps) (vpp->fixed_fpsd)))) {
+    if (mainw->fixed_fpsd>0.||(vpp->fixed_fpsd>0.&&vpp->set_fps!=NULL&&
+			       !((*vpp->set_fps) (vpp->fixed_fpsd)))) {
       do_vpp_fps_error();
       vpp->fixed_fpsd=-1.;
       vpp->fixed_fps_numer=0;
@@ -1259,8 +1267,6 @@
   g_free (msg);
   g_free(plugname);
 
-  if (mainw->ext_playback) needs_restart=TRUE;
-
   while (mainw->noswitch) {
     g_usleep(prefs->sleep_time);
   }
@@ -1292,11 +1298,14 @@
 
 gint64 get_best_audio(_vid_playback_plugin *vpp) {
   // find best audio from video plugin list, matching with audiostream plugins
+
+  // i.e. cross-check video list with astreamer list
+
   int *fmts,*sfmts;
   int ret=AUDIO_CODEC_NONE;
   int i,j=0,nfmts;
   size_t rlen;
-  gchar *astreamer,*com,*playername;
+  gchar *astreamer,*com,*msg;
   gchar buf[1024];
   gchar **array;
   FILE *rfile;
@@ -1305,14 +1314,11 @@
     fmts=(*vpp->get_audio_fmts)();
 
     // make audiostream plugin name
-    playername=g_strdup_printf("%sstreamer.pl",prefs->aplayer);
-    astreamer=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_AUDIO_STREAM,playername,NULL);
-    g_free(playername);
+    astreamer=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_AUDIO_STREAM,"audiostreamer.pl",NULL);
 
     // create sfmts array and nfmts
 
     com=g_strdup_printf("%s get_formats",astreamer);
-    g_free(astreamer);
 
     rfile=popen(com,"r");
     rlen=fread(buf,1,1023,rfile);
@@ -1334,11 +1340,49 @@
     for (i=0;fmts[i]!=-1;i++) {
       // traverse video list and see if audiostreamer supports each one
       if (int_array_contains_value(sfmts,nfmts,fmts[i])) {
+
+	com=g_strdup_printf("%s check %d",astreamer,fmts[i]);
+
+	rfile=popen(com,"r");
+	rlen=fread(buf,1,1023,rfile);
+	pclose(rfile);
+	memset(buf+rlen,0,1);
+	g_free(com);
+
+	if (strlen(buf)>0) {
+	  if (i==0&&prefsw!=NULL) { 
+	    do_error_dialog_with_check_transient 
+	      (buf,TRUE,0,GTK_WINDOW(prefsw->prefs_dialog));
+	    msg=g_strdup_printf(_("Audio stream unable to use preferred format '%s'\n"),anames[fmts[i]]);
+	    d_print(msg);
+	    g_free(msg);
+	  }
+	  continue;
+	}
+
+	if (i>0&&prefsw!=NULL) { 
+	  msg=g_strdup_printf(_("Using format '%s' instead.\n"),anames[fmts[i]]);
+	  d_print(msg);
+	  g_free(msg);
+	}
 	ret=fmts[i];
 	break;
       }
     }
+
+    if (fmts[i]==-1) {
+      //none suitable, stick with first
+      for (i=0;fmts[i]!=-1;i++) {
+	// traverse video list and see if audiostreamer supports each one
+	if (int_array_contains_value(sfmts,nfmts,fmts[i])) {
+	  ret=fmts[i];
+	  break;
+	}

LiVES-1.4.7.tar.bz2/src/plugins.h -> LiVES-1.4.8.tar.bz2/src/plugins.h Changed

@@ -124,8 +124,8 @@
 typedef struct {
   gchar name[51];
   guint32 audio_codec;
-  // must match with the "acodec" GList in interface.c
-  // and bitmaps in the encoder plugins
+  // match with bitmaps in the encoder plugins
+  // and also anames array in plugins.c (see below)
 
 #define AUDIO_CODEC_MP3 0
 #define AUDIO_CODEC_PCM 1
@@ -134,7 +134,8 @@
 #define AUDIO_CODEC_AC3 4
 #define AUDIO_CODEC_AAC 5
 #define AUDIO_CODEC_AMR_NB 6
-#define AUDIO_CODEC_RAW 7
+#define AUDIO_CODEC_RAW 7       // reserved
+#define AUDIO_CODEC_WMA2 8
 
 #define AUDIO_CODEC_MAX 31
   //
@@ -159,6 +160,7 @@
 _encoder;
 
 
+// defined in plugins.c for the whole app
 extern const char *anames[AUDIO_CODEC_MAX];
 
 
@@ -184,7 +186,7 @@
   gint current_clip; ///< current clip number in container (starts at 0, MUST be <= nclips) [rw host]
 
   // video data
-  gint width;
+  gint width; // width and height of picture in frame
   gint height;
   gint64 nframes;
   lives_interlace_t interlace;
@@ -193,7 +195,7 @@
   /// for primary pixel plane
   gint offs_x;
   gint offs_y;
-  gint frame_width;
+  gint frame_width; // frame width and height are the size of the outer frame
   gint frame_height;
 
   gfloat par; ///< pixel aspect ratio

LiVES-1.4.7.tar.bz2/src/preferences.c -> LiVES-1.4.8.tar.bz2/src/preferences.c Changed

@@ -1279,41 +1279,16 @@
     }
     return;
   }
-  if (future_prefs->encoder.of_allowed_acodecs&(1<<AUDIO_CODEC_PCM)) {
-    prefs->acodec_list=g_list_append (prefs->acodec_list,g_strdup(_ ("PCM (highest quality; largest files)")));
-    prefs->acodec_list_to_format[count++]=AUDIO_CODEC_PCM;
-    if (future_prefs->encoder.audio_codec==AUDIO_CODEC_PCM) is_allowed=TRUE;
-  }
-  if (future_prefs->encoder.of_allowed_acodecs&(1<<AUDIO_CODEC_MP3)) {
-    prefs->acodec_list=g_list_append (prefs->acodec_list,g_strdup("mp3"));
-    prefs->acodec_list_to_format[count++]=AUDIO_CODEC_MP3;
-    if (future_prefs->encoder.audio_codec==AUDIO_CODEC_MP3) is_allowed=TRUE;
-  }
-  if (future_prefs->encoder.of_allowed_acodecs&(1<<AUDIO_CODEC_MP2)) {
-    prefs->acodec_list=g_list_append (prefs->acodec_list,g_strdup("mp2"));
-    prefs->acodec_list_to_format[count++]=AUDIO_CODEC_MP2;
-    if (future_prefs->encoder.audio_codec==AUDIO_CODEC_MP2) is_allowed=TRUE;
-  }
-  if (future_prefs->encoder.of_allowed_acodecs&(1<<AUDIO_CODEC_VORBIS)) {
-    prefs->acodec_list=g_list_append (prefs->acodec_list,g_strdup("vorbis"));
-    prefs->acodec_list_to_format[count++]=AUDIO_CODEC_VORBIS;
-    if (future_prefs->encoder.audio_codec==AUDIO_CODEC_VORBIS) is_allowed=TRUE;
-  }
-  if (future_prefs->encoder.of_allowed_acodecs&(1<<AUDIO_CODEC_AC3)) {
-    prefs->acodec_list=g_list_append (prefs->acodec_list,g_strdup("ac3"));
-    prefs->acodec_list_to_format[count++]=AUDIO_CODEC_AC3;
-    if (future_prefs->encoder.audio_codec==AUDIO_CODEC_AC3) is_allowed=TRUE;
-  }
-  if (future_prefs->encoder.of_allowed_acodecs&(1<<AUDIO_CODEC_AAC)) {
-    prefs->acodec_list=g_list_append (prefs->acodec_list,g_strdup("aac"));
-    prefs->acodec_list_to_format[count++]=AUDIO_CODEC_AAC;
-    if (future_prefs->encoder.audio_codec==AUDIO_CODEC_AAC) is_allowed=TRUE;
-  }
-  if (future_prefs->encoder.of_allowed_acodecs&(1<<AUDIO_CODEC_AMR_NB)) {
-    prefs->acodec_list=g_list_append (prefs->acodec_list,g_strdup("amr_nb"));
-    prefs->acodec_list_to_format[count++]=AUDIO_CODEC_AMR_NB;
-    if (future_prefs->encoder.audio_codec==AUDIO_CODEC_AMR_NB) is_allowed=TRUE;
+  for (idx=0;strlen(anames[idx]);idx++) {
+    if (future_prefs->encoder.of_allowed_acodecs&(1<<idx)) {
+      if (idx==AUDIO_CODEC_PCM) prefs->acodec_list=g_list_append (prefs->acodec_list,
+								  g_strdup(_ ("PCM (highest quality; largest files)")));
+      else prefs->acodec_list=g_list_append (prefs->acodec_list,g_strdup(anames[idx]));
+      prefs->acodec_list_to_format[count++]=idx;
+      if (future_prefs->encoder.audio_codec==idx) is_allowed=TRUE;
+    }
   }
+
   if (prefsw != NULL){
     populate_combo_box(GTK_COMBO_BOX(prefsw->acodec_combo), prefs->acodec_list);
   }
@@ -1339,13 +1314,19 @@
 
 
 void after_vpp_changed (GtkWidget *vpp_combo, gpointer advbutton) {
-  gchar *newvpp=gtk_combo_box_get_active_text(GTK_COMBO_BOX(vpp_combo));
+  const gchar *newvpp=gtk_combo_box_get_active_text(GTK_COMBO_BOX(vpp_combo));
+  _vid_playback_plugin *tmpvpp;
 
   if (!g_strcasecmp(newvpp,mainw->none_string)) {
     gtk_widget_set_sensitive (GTK_WIDGET(advbutton), FALSE);
   }
-  else gtk_widget_set_sensitive (GTK_WIDGET(advbutton), TRUE);
+  else {
+    gtk_widget_set_sensitive (GTK_WIDGET(advbutton), TRUE);
 
+    // will call set_astream_settings
+    if ((tmpvpp=open_vid_playback_plugin (newvpp, FALSE))==NULL) return;
+    close_vid_playback_plugin(tmpvpp);
+  }
   g_snprintf (future_prefs->vpp_name,64,"%s",newvpp);
 
   if (future_prefs->vpp_argv!=NULL) {
@@ -1477,15 +1458,6 @@
     _vid_playback_plugin *tmpvpp;
     guint32 orig_acodec=AUDIO_CODEC_NONE;
 
-    // get current audio player
-    const gchar *audp = gtk_combo_box_get_active_text( GTK_COMBO_BOX(prefsw->audp_combo) );
-    gchar *current_player=g_strdup(prefs->aplayer);
-
-    if (!strncmp(audp,"mplayer",7)) g_snprintf(prefs->aplayer,512,"mplayer");
-    else if (!strncmp(audp,"jack",4)) g_snprintf(prefs->aplayer,512,"jack");
-    else if (!strncmp(audp,"sox",3)) g_snprintf(prefs->aplayer,512,"sox");
-    else if (!strncmp(audp,"pulse audio",11)) g_snprintf(prefs->aplayer,512,"pulse");
-
     if (strlen(future_prefs->vpp_name)) {
       if ((tmpvpp=open_vid_playback_plugin (future_prefs->vpp_name, FALSE))==NULL) return;
     }
@@ -1495,10 +1467,6 @@
       get_best_audio(mainw->vpp); // check again because audio player may differ
     }
 
-    // restore current player
-    g_snprintf(prefs->aplayer,512,"%s",current_player);
-    g_free(current_player);
-
     if (tmpvpp->audio_codec!=AUDIO_CODEC_NONE) {
       // make audiostream plugin name
       char buf[1024];
@@ -1506,11 +1474,9 @@
       FILE *rfile;
       size_t rlen;
 
-      gchar *playername=g_strdup_printf("%sstreamer.pl",prefs->aplayer);
-      gchar *astreamer=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_AUDIO_STREAM,playername,NULL);
-      g_free(playername);
+      gchar *astreamer=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_AUDIO_STREAM,"audiostreamer.pl",NULL);
       
-      com=g_strdup_printf("%s check",astreamer);
+      com=g_strdup_printf("%s check %d",astreamer,tmpvpp->audio_codec);
       g_free(astreamer);
       
       rfile=popen(com,"r");
@@ -1521,8 +1487,6 @@
 
       if (rlen>0) {
 	gtk_toggle_button_set_active(togglebutton, FALSE);
-	do_error_dialog_with_check_transient 
-	  (buf,TRUE,0,GTK_WINDOW(prefsw->prefs_dialog));
       }
     }
 
@@ -1543,11 +1507,10 @@
 
 
 void prefsw_set_astream_settings(_vid_playback_plugin *vpp) {
+
   if (vpp==NULL||vpp->audio_codec!=AUDIO_CODEC_NONE) {
-    if (prefs->stream_audio_out) {
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),prefs->stream_audio_out);
-      gtk_widget_set_sensitive(prefsw->checkbutton_stream_audio,TRUE);
-    }
+    gtk_widget_set_sensitive(prefsw->checkbutton_stream_audio,TRUE);
+    //gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),future_prefs->stream_audio_out);
   }
   else {
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),FALSE);
@@ -2685,6 +2648,48 @@
   prefsw->vbox_right_decoding = gtk_vbox_new (FALSE, 20);
   gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_decoding), 20);
 
+
+  // ---
+  hbox = gtk_hbox_new (FALSE, 0);
+  gtk_widget_show (hbox);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, TRUE, TRUE, 0);
+  // ---
+
+
+  prefsw->checkbutton_instant_open = gtk_check_button_new();
+  eventbox = gtk_event_box_new();
+  label = gtk_label_new_with_mnemonic(_("Use instant opening when possible"));
+  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_instant_open);
+  gtk_container_add(GTK_CONTAINER(eventbox), label);
+  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_instant_open);
+  if (palette->style&STYLE_1) {
+      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
+      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
+      gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+  }
+  gtk_box_pack_start (GTK_BOX (hbox), prefsw->checkbutton_instant_open, FALSE, FALSE, 5);
+  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
+  gtk_tooltips_set_tip (mainw->tooltips, prefsw->checkbutton_instant_open, (_("Enable instant opening of some file types using decoder plugins")), NULL);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_instant_open),prefs->instant_open);
+  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
+
+
+  // advanced instant opening
+  advbutton = gtk_button_new_with_mnemonic (_("_Advanced"));
+  gtk_widget_show (advbutton);
+  gtk_box_pack_start (GTK_BOX (hbox), advbutton, FALSE, FALSE, 40);
+
+  g_signal_connect (GTK_OBJECT (advbutton), "clicked",
+		    G_CALLBACK (on_decplug_advanced_clicked),
+		    NULL);
+
+  gtk_widget_set_sensitive(advbutton,prefs->instant_open);
+
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_instant_open), "toggled", GTK_SIGNAL_FUNC(instopen_toggled), advbutton);
+
+
+
+
   hbox109 = gtk_hbox_new (FALSE, 0);
   gtk_widget_show (hbox109);
   gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox109, TRUE, FALSE, 0);
@@ -2791,43 +2796,6 @@
   gtk_widget_show (hbox);
   gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, TRUE, TRUE, 0);
   // ---
-  prefsw->checkbutton_instant_open = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Use instant opening when possible"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_instant_open);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_instant_open);
-  if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);

LiVES-1.4.7.tar.bz2/src/preferences.h -> LiVES-1.4.8.tar.bz2/src/preferences.h Changed

LiVES-1.4.7.tar.bz2/src/pulse.c -> LiVES-1.4.8.tar.bz2/src/pulse.c Changed

@@ -140,7 +140,7 @@
   while (nbytes>0) {
     if (nbytes<xbytes) xbytes=nbytes;
     buff=g_malloc0(xbytes);
-    audio_stream(buff,xbytes,pdriver->astream_fd);
+    if (pdriver->astream_fd!=-1) audio_stream(buff,xbytes,pdriver->astream_fd);
     pa_stream_write(pdriver->pstream,buff,xbytes,pulse_buff_free,0,PA_SEEK_RELATIVE);
     nbytes-=xbytes;
   }
@@ -460,14 +460,14 @@
 	     offs+=xbytes;
 	     needs_free=TRUE;
 	   }
-	   audio_stream(buffer,xbytes,pulsed->astream_fd);
+	   if (pulsed->astream_fd!=-1) audio_stream(buffer,xbytes,pulsed->astream_fd);
 	   pa_stream_write(pulsed->pstream,buffer,xbytes,buffer==pulsed->aPlayPtr->data?NULL:pulse_buff_free,0,PA_SEEK_RELATIVE);
 	 }
 	 else {
 	   if (pulsed->read_abuf>-1&&!pulsed->mute) {
 	     shortbuffer=g_malloc0(xbytes);
 	     sample_move_abuf_int16(shortbuffer,pulsed->out_achans,(xbytes>>1)/pulsed->out_achans,pulsed->out_arate);
-	     audio_stream(shortbuffer,xbytes,pulsed->astream_fd);
+	     if (pulsed->astream_fd!=-1) audio_stream(shortbuffer,xbytes,pulsed->astream_fd);
 	     pa_stream_write(pulsed->pstream,shortbuffer,xbytes,pulse_buff_free,0,PA_SEEK_RELATIVE);
 	   }
 	   else {

LiVES-1.4.7.tar.bz2/src/resample.c -> LiVES-1.4.8.tar.bz2/src/resample.c Changed

@@ -1,6 +1,6 @@
 // resample.c
 // LiVES
-// (c) G. Finch 2004 - 2010 <salsaman@xs4all.nl>
+// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -107,7 +107,7 @@
 
 	// we will have more frames...
 	// ...do resize first
-	if (mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate==-1) {
+	if (mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate==-1||prefs->enc_letterbox) {
 	  cfile->ohsize=cfile->hsize;
 	  cfile->ovsize=cfile->vsize;
 
@@ -115,8 +115,21 @@
 	    cfile->fx_frame_pump=1;
 	  }
 
-	  com=g_strdup_printf ("smogrify resize_all %s %d %d %d %s",cfile->handle,cfile->frames,width,height,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
-	  
+	  if (!prefs->enc_letterbox)
+	    com=g_strdup_printf ("smogrify resize_all %s %d %d %d %s",cfile->handle,cfile->frames,width,height,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+	  else {
+	    int iwidth=cfile->hsize,iheight=cfile->vsize;
+	    calc_maxspect(width,height,&iwidth,&iheight);
+
+	    if (iwidth==cfile->hsize&&iheight==cfile->vsize) {
+	      iwidth=-iwidth;
+	      iheight=-iheight;
+	    }
+
+	    reorder_leave_back=TRUE;
+	    com=g_strdup_printf ("smogrify resize_all %s %d %d %d %s %d %d",cfile->handle,cfile->frames,width,height,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",iwidth,iheight);
+	  }
+
 	  cfile->progress_start=1;
 	  cfile->progress_end=cfile->frames;
 	  
@@ -130,6 +143,7 @@
 	  rs_builtin=TRUE;
 	}
 	else {
+	  // use resize plugin
 	  int error;
 	  weed_plant_t *first_out;
 	  weed_plant_t *ctmpl;
@@ -142,6 +156,8 @@
 	  weed_set_int_value(ctmpl,"host_height",height);
 	}
 	
+	cfile->nokeep=TRUE;
+
 	if ((rs_builtin&&!do_progress_dialog(TRUE,TRUE,msg))||(!rs_builtin&&!on_realfx_activate_inner(1,resize_rfx))) {
 	  mainw->resizing=FALSE;
 	  g_free(msg);
@@ -155,6 +171,7 @@
 	  cfile->undo_end=cfile->frames;
 	  cfile->fx_frame_pump=0;
 	  on_undo_activate(NULL,NULL);
+	  cfile->nokeep=FALSE;
 	  return FALSE;
 	}
 	g_free(msg);
@@ -176,7 +193,11 @@
 
 	// special "cheat" mode for LiVES
 	reorder_leave_back=TRUE;
-	    
+
+	reorder_width=width;
+	reorder_height=height;
+
+	mainw->resizing=TRUE;
 	on_resample_vid_ok (NULL,NULL);
 
 	reorder_leave_back=FALSE;
@@ -226,8 +247,14 @@
       cfile->undo_start=1;
       cfile->undo_end=cfile->frames;
       
+      reorder_width=width;
+      reorder_height=height;
+
       on_resample_vid_ok (NULL,NULL);
       
+      reorder_width=reorder_height=0;
+      reorder_leave_back=FALSE;
+
       if (audio_resampled) cfile->undo_action=UNDO_ATOMIC_RESAMPLE_RESIZE;
       if (mainw->error) {
 	on_undo_activate(NULL,NULL);
@@ -246,15 +273,27 @@
       cfile->undo_start=1;
       cfile->undo_end=cfile->frames;
 
-      if (mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate==-1) {
+      if (mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate==-1||prefs->enc_letterbox) {
 	// use builtin resize
 
 	if (cfile->clip_type==CLIP_TYPE_FILE) {
 	  cfile->fx_frame_pump=1;
 	}
 
-	com=g_strdup_printf ("smogrify resize_all %s %d %d %d %s",cfile->handle,cfile->frames,width,height,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
-	
+	if (!prefs->enc_letterbox)
+	  com=g_strdup_printf ("smogrify resize_all %s %d %d %d %s",cfile->handle,cfile->frames,width,height,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+	else {
+	  int iwidth=cfile->hsize,iheight=cfile->vsize;
+	  calc_maxspect(width,height,&iwidth,&iheight);
+
+	  if (iwidth==cfile->hsize&&iheight==cfile->vsize) {
+	    iwidth=-iwidth;
+	    iheight=-iheight;
+	  }
+
+	  com=g_strdup_printf ("smogrify resize_all %s %d %d %d %s %d %d",cfile->handle,cfile->frames,width,height,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",iwidth,iheight);
+	}
+
 	cfile->progress_start=1;
 	cfile->progress_end=cfile->frames;
 	
@@ -284,6 +323,8 @@
 	weed_set_int_value(ctmpl,"host_height",height);
       }
 
+      cfile->nokeep=TRUE;
+
       if ((rs_builtin&&!do_progress_dialog(TRUE,TRUE,msg))||(!rs_builtin&&!on_realfx_activate_inner(1,resize_rfx))) {
 	mainw->resizing=FALSE;
 	if (msg!=NULL) g_free(msg);
@@ -296,6 +337,7 @@
 	}
 	cfile->fx_frame_pump=0;
 	on_undo_activate (NULL,NULL);
+	cfile->nokeep=FALSE;
 	return FALSE;
       }
 
@@ -556,7 +598,7 @@
 //////////////////////////////////////////////////////////////////
 
 
-static void on_reorder_activate (void) {
+static void on_reorder_activate (int rwidth, int rheight) {
   gchar *msg;
   gboolean has_lmap_error=FALSE;
 
@@ -578,7 +620,7 @@
 
   //  we  do the reorder in reorder_frames()
   // this will clear event_list and set it in event_list_back
-  if ((cfile->frames=reorder_frames())<0) {
+  if ((cfile->frames=reorder_frames(rwidth,rheight))<0) {
     // reordering error
     if (!(cfile->undo_action==UNDO_RESAMPLE)) {
      cfile->frames=-cfile->frames;
@@ -963,7 +1005,7 @@
   cfile->undo_action=UNDO_RESAMPLE;
   // REORDER
   // this calls reorder_frames, which sets event_list_back==event_list, and clears event_list
-  on_reorder_activate();
+  on_reorder_activate(reorder_width,reorder_height);
   
   if (cfile->frames<=0||mainw->cancelled!=CANCEL_NONE) {
     // reordering error...
@@ -2200,7 +2242,7 @@
   }
 
   if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_FRAMES)&&(mainw->xlays=layout_frame_is_affected(mainw->current_file,1))!=NULL) {
-    if (!do_warning_dialog(_("\nChanging the speed will cause frames to shift some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+    if (!do_warning_dialog(_("\nChanging the speed will cause frames to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
       g_list_free_strings(mainw->xlays);
       g_list_free(mainw->xlays);
       mainw->xlays=NULL;
@@ -2214,7 +2256,7 @@
   }
 
   if (mainw->fx1_bool&&!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_AUDIO)&&(mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
-    if (!do_warning_dialog(_("\nChanging the speed will cause audio to shift some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+    if (!do_warning_dialog(_("\nChanging the speed will cause audio to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
       g_list_free_strings(mainw->xlays);
       g_list_free(mainw->xlays);
       mainw->xlays=NULL;
@@ -2299,15 +2341,30 @@
 
 
 
-gint
-reorder_frames(void) {
+gint reorder_frames(int rwidth, int rheight) {
   int new_frames=cfile->old_frames;
   int cur_frames=cfile->frames;
   gchar **array;
   gchar *com;
 
-  if (reorder_width*reorder_height==0) com=g_strdup_printf("smogrify reorder %s %s %d 0 0 %d %d",cfile->handle,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",!mainw->endian,reorder_leave_back,cfile->frames);

LiVES-1.4.7.tar.bz2/src/resample.h -> LiVES-1.4.8.tar.bz2/src/resample.h Changed

LiVES-1.4.7.tar.bz2/src/rfx-builder.c -> LiVES-1.4.8.tar.bz2/src/rfx-builder.c Changed

@@ -3921,16 +3921,11 @@
   com=g_strdup_printf("smogrify build_rfx_plugins builtinx %s%s%s %s%s%s %s/bin",prefs->prefix_dir,PLUGIN_SCRIPTS_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN_SCRIPTS,prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN,prefs->prefix_dir);
   dummyvar=system(com);
   g_free(com);
-  threaded_dialog_spin();
   d_print (_ ("custom...")); 
-  threaded_dialog_spin();
   dummyvar=system("smogrify build_rfx_plugins custom");
-  threaded_dialog_spin();
   d_print (_("test...")); 
-  threaded_dialog_spin();
   dummyvar=system("smogrify build_rfx_plugins test");
 
-  threaded_dialog_spin();
   d_print(_("rebuilding dynamic menu entries..."));
   while (g_main_context_iteration(NULL,FALSE));
   threaded_dialog_spin();
@@ -4529,7 +4524,6 @@
     for (i=0;i<=mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+mainw->num_rendered_effects_test;i++) {
       if (mainw->rendered_fx!=NULL) {
 	if (mainw->rendered_fx[i].menuitem!=NULL) {
-	  threaded_dialog_spin();
 	  remove_from_parent(mainw->rendered_fx[i].menuitem);
 	  threaded_dialog_spin();
 	}
@@ -4570,34 +4564,21 @@
     gtk_widget_modify_bg(mainw->run_test_rfx_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
   }
   gtk_widget_show(mainw->run_test_rfx_menu);
-  threaded_dialog_spin();
-
-
-  threaded_dialog_spin();
 
   mainw->custom_effects_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->custom_effects_submenu), mainw->custom_effects_menu);
   if (palette->style&STYLE_1) {
     gtk_widget_modify_bg(mainw->custom_effects_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
   }
-  threaded_dialog_spin();
-
-
-  threaded_dialog_spin();
 
   mainw->custom_tools_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->custom_tools_submenu), mainw->custom_tools_menu);
   if (palette->style&STYLE_1) {
     gtk_widget_modify_bg(mainw->custom_tools_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
   }
-  threaded_dialog_spin();
-
-
-
 
 
   // scan rendered effect directories
-  threaded_dialog_spin();
   rfx_custom_list=get_plugin_list (PLUGIN_RENDERED_EFFECTS_CUSTOM,FALSE,NULL,NULL);
   rfx_custom_list_length=g_list_length(rfx_custom_list);
 
@@ -4611,6 +4592,8 @@
     rfx_builtin_list_length=g_list_length(rfx_builtin_list);
   }
   rfx_list_length=rfx_builtin_list_length+rfx_custom_list_length+rfx_test_list_length;
+
+  threaded_dialog_spin();
     
   rendered_fx=(lives_rfx_t *)g_malloc ((rfx_list_length+1)*sizeof(lives_rfx_t));
   
@@ -4618,7 +4601,6 @@
   rendered_fx[0].name=g_strdup("realtime_fx");
   rendered_fx[0].menu_text=g_strdup (_("_Apply Real Time Effects to Selection"));
   rendered_fx[0].action_desc=g_strdup ("Applying Current Real Time Effects to");
-  threaded_dialog_spin();
 
   rendered_fx[0].props=0;
   rendered_fx[0].num_params=0;
@@ -4665,7 +4647,6 @@
       }
       
       plugin_name=g_strdup(g_list_nth_data(rfx_list,plugin_idx-offset));
-      threaded_dialog_spin();
 
       if (mainw->splash_window!=NULL) {
 	splash_msg((tmp=g_strdup_printf(_("Loading rendered effect %s..."),plugin_name)),.2);
@@ -4675,12 +4656,12 @@
 #ifdef DEBUG_RENDER_FX
       g_print("Checking plugin %s\n",plugin_name);
 #endif
-      threaded_dialog_spin();
+
       if ((define=plugin_request_by_line(type,plugin_name,"get_define"))==NULL) {
 #ifdef DEBUG_RENDER_FX
       g_print("No get_define in %s\n",plugin_name);
 #endif
-      threaded_dialog_spin();
+
       continue;
       }
       def=g_strdup(g_list_nth_data(define,0));
@@ -4692,7 +4673,6 @@
 	g_print("Invalid get_define in %s\n",plugin_name);
 #endif
 	g_free(def);
-	threaded_dialog_spin();
 	continue;
       }
       if (strcmp(def+1,RFX_VERSION)) {
@@ -4700,13 +4680,10 @@
 	g_print("Invalid version %s instead of %s in %s\n",def+1,RFX_VERSION,plugin_name);
 #endif
 	g_free(def);
-	threaded_dialog_spin();
 	continue;
       }
-      threaded_dialog_spin();
       memset(def+1,0,1);
       
-      threaded_dialog_spin();
       if ((description=plugin_request_common (type,plugin_name,"get_description",def,TRUE))!=NULL&&(props=plugin_request_common (type,plugin_name,"get_capabilities",def,FALSE))!=NULL&&g_list_length(description)>3) {
 	rfx=&rendered_fx[rfx_slot_count++];
 	rfx->name=g_strdup(plugin_name);
@@ -4738,10 +4715,8 @@
 	description=NULL;
       }
       g_free(def);
-      threaded_dialog_spin();
     }
 
-    threaded_dialog_spin();
     if (rfx_builtin_list!=NULL) {
       g_list_free_strings (rfx_builtin_list);
       g_list_free (rfx_builtin_list);
@@ -4755,7 +4730,6 @@
       g_list_free (rfx_test_list);
     }
     g_free(type);
-    threaded_dialog_spin();
   }
 
   rfx_slot_count--;
@@ -4826,7 +4800,6 @@
       }
       
     if (!(rfx->props&RFX_PROPS_MAY_RESIZE)&&rfx->min_frames>=0&&rfx->num_in_channels==1) {
-      threaded_dialog_spin();
       // add resizing effects to tools menu later
       g_snprintf (txt,61,"_%s",_(rfx->menu_text));
       if (rfx->num_params) g_strappend (txt,64,"...");
@@ -4869,13 +4842,12 @@
       }
       if (rfx->min_frames>=0) gtk_widget_set_sensitive(menuitem,FALSE);
       rfx->menuitem=menuitem;
-      threaded_dialog_spin();
     }
   }
 
 
-
   threaded_dialog_spin();
+
   // custom effects
   if (rc_child>0) {
     gtk_widget_show (mainw->custom_effects_separator);
@@ -4887,9 +4859,7 @@
     gtk_widget_hide (mainw->custom_effects_menu);
     gtk_widget_hide (mainw->custom_effects_submenu);
   }
-  threaded_dialog_spin();
 
-  threaded_dialog_spin();
   mainw->utilities_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->utilities_submenu), mainw->utilities_menu);
   if (palette->style&STYLE_1) {
@@ -5043,12 +5013,12 @@
 			    (gpointer)rfx);
 	}
       }
-      threaded_dialog_spin();
     }
   }
 
 
   threaded_dialog_spin();
+
   if (mainw->has_custom_tools||mainw->has_custom_utilities) {
     gtk_widget_show(mainw->custom_tools_separator);
     gtk_widget_show(mainw->custom_tools_menu);
@@ -5082,7 +5052,6 @@
     gtk_widget_hide(mainw->custom_gens_submenu);
   }
   if (mainw->current_file>0&&mainw->playing_file==-1) sensitize();
-  threaded_dialog_spin();
 
 }

LiVES-1.4.7.tar.bz2/src/rte_window.c -> LiVES-1.4.8.tar.bz2/src/rte_window.c Changed

@@ -378,11 +378,35 @@
 
 
 
+
+static gboolean read_perkey_defaults(int kfd, int key, int mode, int version) {
+  gboolean ret=TRUE;
+  int nparams;
+  size_t bytes=read(kfd,&nparams,sizint);
+
+  if (nparams>65536) {
+    g_printerr("Too many params, file is probably broken.\n");
+    return FALSE;
+  }
+
+  if (bytes<sizint) {
+    return FALSE;
+  }
+
+  if (nparams>0) {
+    ret=read_key_defaults(kfd,nparams,key,mode,version);
+  }
+  return ret;
+}
+
+
+
+
 gboolean on_load_keymap_clicked (GtkButton *button, gpointer user_data) {
   int modes=rte_getmodespk();
   int i;
   int kfd;
-  int version,nparams;
+  int version;
   int hlen;
   FILE *kfile=NULL;
   gchar *msg,*tmp;
@@ -566,20 +590,30 @@
 
     if (key<1||key>prefs->rte_keys_virtual) {
       d_print((tmp=g_strdup_printf(_("Invalid key %d in %s\n"),key,keymap_file)));
+      g_printerr(tmp);
       g_free(tmp);
       notfound=TRUE;
       g_free(hashname);
+      if (keymap_file2!=NULL) {
+	// read param defaults
+	if (!read_perkey_defaults(kfd,-1,-1,version)) break;
+      }
       continue;
     }
 
     def_modes[key-1]++;
 
-
     if (strncmp(hashname,"Weed",4)||strlen(hashname)<5) {
       d_print((tmp=g_strdup_printf(_("Invalid effect %s in %s\n"),hashname,keymap_file)));
+      g_printerr(tmp);
       g_free(tmp);
       notfound=TRUE;
       g_free(hashname);
+      if (keymap_file2!=NULL) {
+	// read param defaults
+	if (!read_perkey_defaults(kfd,-1,-1,version)) break;
+      }
+      def_modes[key-1]--;
       continue;
     }
 
@@ -589,8 +623,15 @@
     if ((mode=weed_add_effectkey(key,whashname,TRUE))==-1) {
       // could not locate effect
       d_print((tmp=g_strdup_printf(_("Unknown effect %s in %s\n"),whashname,keymap_file)));
+      g_printerr(tmp);
+      g_free(tmp);
       notfound=TRUE;
       g_free(hashname);
+      if (keymap_file2!=NULL) {
+	// read param defaults
+	if (!read_perkey_defaults(kfd,-1,-1,version)) break;
+      }
+      def_modes[key-1]--;
       continue;
     }
 
@@ -598,12 +639,24 @@
 
     if (mode==-2){
       d_print((tmp=g_strdup_printf(_("This version of LiVES cannot mix generators/non-generators on the same key (%d) !\n"),key)));
+      g_printerr(tmp);
       g_free(tmp);
+      if (keymap_file2!=NULL) {
+	// read param defaults
+	if (!read_perkey_defaults(kfd,-1,-1,version)) break;
+      }
+      def_modes[key-1]--;
       continue;
     }
     if (mode==-3){
       d_print((tmp=g_strdup_printf(_("Too many effects bound to key %d.\n"),key)));
+      g_printerr(tmp);
       g_free(tmp);
+      if (keymap_file2!=NULL) {
+	// read param defaults
+	if (!read_perkey_defaults(kfd,-1,-1,version)) break;
+      }
+      def_modes[key-1]--;
       continue;
     }
     if (rte_window!=NULL) {
@@ -612,17 +665,9 @@
       type_label_set_text(key-1,mode);
     }
 
-
     if (keymap_file2!=NULL) {
       // read param defaults
-      bytes=read(kfd,&nparams,sizint);
-      if (bytes<sizint) {
-	eof=TRUE;
-	break;
-      }
-      if (nparams>0) {
-	read_key_defaults(kfd,nparams,key-1,def_modes[key-1],version);
-      }
+      if (!read_perkey_defaults(kfd,key-1,def_modes[key-1],version)) break;
     }
   }

LiVES-1.4.7.tar.bz2/src/saveplay.c -> LiVES-1.4.8.tar.bz2/src/saveplay.c Changed

@@ -1,6 +1,6 @@
 // saveplay.c
 // LiVES (lives-exe)
-// (c) G. Finch 2003 - 2010
+// (c) G. Finch 2003 - 2011
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <setjmp.h>
 
 #include "main.h"
 #include "callbacks.h"
@@ -103,7 +102,6 @@
     while (g_main_context_iteration (NULL,FALSE));
     threaded_dialog_spin();
     g_usleep(prefs->sleep_time);
-    threaded_dialog_spin();
   }
   
   dummychar=fgets(mainw->msg,512,infofile);
@@ -544,6 +542,14 @@
 	return;
       }
     }
+
+
+
+
+
+
+    //  loading:
+
     // 'entry point' when we switch back
     
     // spin until loading is complete
@@ -835,39 +841,90 @@
 
 
 
-void save_file (gboolean existing, gchar *n_file_name) {
-  // if existing is TRUE, we are saving under the existing file_name
-  gint arate;
-  gchar *mesg,*bit,*tmp;
-  gchar *com;
-  gchar *full_file_name=NULL;
-  gint asigned=!(cfile->signed_endian&AFORM_UNSIGNED);
-  gboolean not_cancelled;
 
-  gint current_file=mainw->current_file;
-  gdouble aud_start=0.,aud_end=0.;
-  gchar *fps_string;
+void save_frame (GtkMenuItem *menuitem, gpointer user_data) {
+  int frame;
+  // save a single frame from a clip
+  gchar *filt[2];
+  gchar *ttl;
+  char *filename;
 
-  gchar *extra_params=g_strdup("");
+  filt[0]=g_strdup_printf ("*.%s",cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+  filt[1]=NULL;
 
-  gint startframe=1;
+  frame=GPOINTER_TO_INT(user_data);
 
-  gboolean safe_symlinks=prefs->safe_symlinks;
+  if (frame>0)
+    ttl=g_strdup_printf (_("LiVES: Save Frame %d as..."),frame);
 
-  gchar *redir=g_strdup("1>&2 2>/dev/null");
-  int new_stderr=-1;
+  else
+    ttl=g_strdup (_("LiVES: Save Frame as..."));
 
-  GError *gerr=NULL;
 
+  filename=choose_file(strlen(mainw->image_dir)?mainw->image_dir:NULL,NULL,filt,GTK_FILE_CHOOSER_ACTION_SAVE,ttl,NULL);
+
+  g_free (filt[0]);
+  g_free (ttl);
+
+  if (filename==NULL||!strlen(filename)) return;
+
+
+  if (!save_frame_inner(mainw->current_file,GPOINTER_TO_INT (frame),filename,-1,-1,FALSE)) return;
+
+  g_snprintf(mainw->image_dir,256,"%s",filename);
+  get_dirname(mainw->image_dir);
+  if (prefs->save_directories) {
+    gchar *tmp;
+    set_pref ("image_dir",(tmp=g_filename_from_utf8(mainw->image_dir,-1,NULL,NULL,NULL)));
+    g_free(tmp);
+  }
+
+}
+
+
+
+
+
+
+void save_file (int clip, int start, int end, const char *filename) {
+  // save clip from frame start to frame end
+  file *sfile=mainw->files[clip],*nfile=NULL;
+
+  gdouble aud_start=0.,aud_end=0.;
+
+  const char *n_file_name;
+  gchar *fps_string;
+  gchar *extra_params=NULL;
+  gchar *redir=g_strdup("1>&2 2>/dev/null");
   gchar *new_stderr_name=NULL;
+  gchar *mesg,*bit,*tmp;
+  gchar *com;
+  gchar *full_file_name=NULL;
 
-  gboolean output_exists=FALSE;
+  int new_stderr=-1;
+  gint startframe=1;
+  gint current_file=mainw->current_file;
+  gint asigned=!(sfile->signed_endian&AFORM_UNSIGNED);
+  gint arate;
+  gint new_file=-1;
+
+  GError *gerr=NULL;
 
   struct stat filestat;
   time_t file_mtime=0;
 
   gulong fsize;
 
+  GtkWidget *hbox;
+
+  gboolean safe_symlinks=prefs->safe_symlinks;
+  gboolean not_cancelled;
+  gboolean output_exists=FALSE;
+  gboolean existing=FALSE;
+  gboolean save_all=FALSE;
+
+  if (start==1&&end==sfile->frames) save_all=TRUE;
+
   // new handling for save selection:
   // symlink images 1 - n to the encoded frames
   // symlinks are now created in /tmp (for dynebolic)
@@ -888,14 +945,34 @@
 	rdet=NULL;
 	if (resaudw!=NULL) g_free(resaudw);
 	resaudw=NULL;
-	g_free(extra_params);
 	return;
       }
     }
   }
 
   // get file extension
-  check_encoder_restrictions (TRUE,FALSE);
+  check_encoder_restrictions (TRUE,FALSE,save_all);
+
+  hbox = gtk_hbox_new (FALSE, 0);
+  mainw->fx1_bool=TRUE;
+  add_suffix_check(GTK_BOX(hbox),prefs->encoder.of_def_ext);
+  gtk_widget_show_all(hbox);
+
+  if (filename==NULL) {
+    gchar *ttl=g_strdup_printf (_("LiVES: Save Clip as..."));
+    do {
+      n_file_name=choose_file(mainw->vid_save_dir,NULL,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,ttl,hbox);
+      if (n_file_name==NULL) return;
+    } while (!strlen(n_file_name));
+    g_snprintf(mainw->vid_save_dir,256,"%s",n_file_name);
+    get_dirname(mainw->vid_save_dir);
+    if (prefs->save_directories) {
+      set_pref ("vid_save_dir",(tmp=g_filename_from_utf8(mainw->vid_save_dir,-1,NULL,NULL,NULL)));
+      g_free(tmp);
+    }
+    g_free(ttl);
+  }
+  else n_file_name=filename;
 
   //append default extension (if necessary)
   if (!strlen (prefs->encoder.of_def_ext)) {
@@ -905,7 +982,10 @@
     }
   }
   else {
-    if (mainw->fx1_bool&&(strlen(n_file_name)<=strlen(prefs->encoder.of_def_ext)||strncmp(n_file_name+strlen(n_file_name)-strlen(prefs->encoder.of_def_ext)-1,".",1)||strcmp(n_file_name+strlen(n_file_name)-strlen(prefs->encoder.of_def_ext),prefs->encoder.of_def_ext))) {
+    if (mainw->fx1_bool&&(strlen(n_file_name)<=strlen(prefs->encoder.of_def_ext)||
+			  strncmp(n_file_name+strlen(n_file_name)-strlen(prefs->encoder.of_def_ext)-1,".",1)||
+			  strcmp(n_file_name+strlen(n_file_name)-strlen(prefs->encoder.of_def_ext),
+				 prefs->encoder.of_def_ext))) {
       full_file_name=g_strconcat(n_file_name,".",prefs->encoder.of_def_ext,NULL);
     }
   }
@@ -925,14 +1005,13 @@
 	if (resaudw!=NULL) g_free(resaudw);
 	resaudw=NULL;

LiVES-1.4.7.tar.bz2/src/startup.c -> LiVES-1.4.8.tar.bz2/src/startup.c Changed

LiVES-1.4.7.tar.bz2/src/stream.c -> LiVES-1.4.8.tar.bz2/src/stream.c Changed

LiVES-1.4.7.tar.bz2/src/utils.c -> LiVES-1.4.8.tar.bz2/src/utils.c Changed

@@ -1,6 +1,6 @@
 // utils.c
 // LiVES
-// (c) G. Finch 2003 - 2010 <salsaman@xs4all.nl>
+// (c) G. Finch 2003 - 2011 <salsaman@xs4all.nl>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -193,6 +193,21 @@
 }
 
 
+static void calc_aframeno(gint fileno) {
+#ifdef ENABLE_JACK
+  if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&mainw->jackd->playing_file==fileno) {
+    // get seek_pos from jack
+    mainw->aframeno=lives_jack_get_pos(mainw->jackd)/cfile->fps+1.;
+  }
+#endif
+#ifdef HAVE_PULSE_AUDIO
+  if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&mainw->pulsed->playing_file==fileno) {
+    // get seek_pos from pulse
+    mainw->aframeno=lives_pulse_get_pos(mainw->pulsed)/cfile->fps+1.;
+  }
+#endif
+}
+
 
 
 
@@ -240,28 +255,12 @@
 
   if (sfile==NULL) return 0;
 
-  // calculate audio "frame"
-  if (mainw->playing_file==fileno) {
-#ifdef ENABLE_JACK
-    if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&mainw->jackd->playing_file==fileno) {
-      // get seek_pos from jack
-      mainw->aframeno=lives_jack_get_pos(mainw->jackd)/cfile->fps+1.;
-    }
-#endif
-#ifdef HAVE_PULSE_AUDIO
-    // request for another audio buffer - used only during mt playback
-    if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&mainw->pulsed->playing_file==fileno) {
-      // get seek_pos from pulse
-      mainw->aframeno=lives_pulse_get_pos(mainw->pulsed)/cfile->fps+1.;
-    }
-#endif
-  }
-
 
   cframe=sfile->last_frameno;
 
   if (fps==0.) {
     *ntc=otc;
+    calc_aframeno(fileno);
     return cframe;
   }
 
@@ -273,6 +272,11 @@
 
   if (nframe==cframe||mainw->foreign) return nframe;
 
+  // calculate audio "frame"
+  if (mainw->playing_file==fileno) {
+    calc_aframeno(fileno);
+  }
+
   if (mainw->playing_file==fileno) {
     last_frame=(mainw->playing_sel&&!mainw->is_rendering)?sfile->end:mainw->play_end;
     first_frame=mainw->playing_sel?sfile->start:1;
@@ -435,6 +439,19 @@
 
   if (*cwidth<=0||*cheight<=0||rwidth<=0||rheight<=0) return;
 
+  if (*cwidth>rwidth) {
+    // image too wide shrink it
+    aspect=(gdouble)rwidth/(gdouble)(*cwidth);
+    *cwidth=rwidth;
+    *cheight=(gdouble)(*cheight)*aspect;
+  }
+  if (*cheight>rheight) {
+    // image too tall shrink it
+    aspect=(gdouble)rheight/(gdouble)(*cheight);
+    *cheight=rheight;
+    *cwidth=(gdouble)(*cwidth)*aspect;
+  }
+
   aspect=(gdouble)*cwidth/(gdouble)*cheight;
 
   if ((gdouble)rheight*aspect<=rwidth) {
@@ -590,8 +607,6 @@
     break;
   }
 
-  gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter);
-
   if (affects_current&&user_data!=NULL) {
     mainw->affected_layout_marks=g_list_append(mainw->affected_layout_marks,(gpointer)gtk_text_buffer_create_mark(GTK_TEXT_BUFFER(mainw->layout_textbuffer),NULL,&end_iter,TRUE));
   }
@@ -603,8 +618,8 @@
       array=g_strsplit(lmap->data,"|",-1);
       text=g_strdup_printf("%s\n",array[0]);
       gtk_text_buffer_insert(GTK_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,array[0]);
       g_free(text);
+      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,array[0]);
       g_strfreev(array);
       lmap=lmap->next;
     }
@@ -614,10 +629,9 @@
     if (affects_current) {
       text=g_strdup_printf("%s\n",mainw->cl_string);
       gtk_text_buffer_insert(GTK_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->cl_string);
       g_free(text);
+      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->cl_string);
 
-      gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter);
       mainw->affected_layout_marks=g_list_append(mainw->affected_layout_marks,(gpointer)gtk_text_buffer_create_mark(GTK_TEXT_BUFFER(mainw->layout_textbuffer),NULL,&end_iter,TRUE));
 
     }
@@ -626,8 +640,8 @@
       array=g_strsplit(lmap->data,"|",-1);
       text=g_strdup_printf("%s\n",array[0]);
       gtk_text_buffer_insert(GTK_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,array[0]);
       g_free(text);
+      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,array[0]);
       g_strfreev(array);
       lmap=lmap->next;
     }
@@ -638,10 +652,9 @@
     if (affects_current) {
       text=g_strdup_printf("%s\n",mainw->cl_string);
       gtk_text_buffer_insert(GTK_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->cl_string);
       g_free(text);
+      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->cl_string);
 
-      gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter);
       mainw->affected_layout_marks=g_list_append(mainw->affected_layout_marks,(gpointer)gtk_text_buffer_create_mark(GTK_TEXT_BUFFER(mainw->layout_textbuffer),NULL,&end_iter,TRUE));
     }
     lmap=(GList *)user_data;
@@ -650,10 +663,10 @@
       orig_fps=strtod(array[3],NULL);
       resampled_frame=count_resampled_frames(frameno,orig_fps,mainw->files[clipno]->fps);
       if (resampled_frame<=atoi(array[2])) {
-	text=g_strdup(array[0]);
-	mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,array[0]);
-	if (g_list_find(mainw->affected_layouts_map,array[0])==NULL) mainw->affected_layouts_map=g_list_append(mainw->affected_layouts_map,g_strdup(array[0]));
+	text=g_strdup_printf("%s\n",array[0]);
+	gtk_text_buffer_insert(GTK_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
 	g_free(text);
+	mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,array[0]);
       }
       g_strfreev(array);
       lmap=lmap->next;
@@ -665,10 +678,9 @@
     if (affects_current) {
       text=g_strdup_printf("%s\n",mainw->cl_string);
       gtk_text_buffer_insert(GTK_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->cl_string);
       g_free(text);
+      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->cl_string);
 
-      gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter);
       mainw->affected_layout_marks=g_list_append(mainw->affected_layout_marks,(gpointer)gtk_text_buffer_create_mark(GTK_TEXT_BUFFER(mainw->layout_textbuffer),NULL,&end_iter,TRUE));
     }
     lmap=(GList *)user_data;
@@ -676,10 +688,10 @@
       array=g_strsplit(lmap->data,"|",-1);
       max_time=strtod(array[4],NULL);
       if (max_time>0.&&atime<=max_time) {
-	text=g_strdup(array[0]);
+	text=g_strdup_printf("%s\n",array[0]);
 	gtk_text_buffer_insert(GTK_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-	mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,array[0]);
 	g_free(text);
+	mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,array[0]);
       }
       g_strfreev(array);
       lmap=lmap->next;
@@ -729,8 +741,6 @@
   gchar *info_file=g_strdup_printf("%s/.locks.%d",prefs->tmpdir,getpid());
   gchar *com=g_strdup_printf("smogrify check_for_lock \"%s\" %s %d >%s",set_name,capable->myname,getpid(),info_file);
 
-  int lockpid;
-
   unlink(info_file);
   threaded_dialog_spin();
   dummyvar=system(com);
@@ -744,7 +754,6 @@
     if ((bytes=read(info_fd,mainw->msg,256))>0) {
       close(info_fd);
       memset(mainw->msg+bytes,0,1);
-      lockpid=atoi(mainw->msg);
 
       if (type==0) {

LiVES-1.4.7.tar.bz2/src/videodev.c -> LiVES-1.4.8.tar.bz2/src/videodev.c Changed

Changes of Revision 10