Packman Build Service PMBS

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

Changes of Revision 4

LiVES.changes Changed

@@ -1,4 +1,18 @@
 -------------------------------------------------------------------
+Sun Jun 12 21:36:09 UTC 2011 - pascal.bleser@opensuse.org
+
+- update to 1.4.3:
+  * an important bug with audio shifting when leaving/re-entering multi-track
+    mode was fixed
+  * support was added for spacial multi-threading in effects plugins
+  * the Antialias option in Preferences was fixed, as were buttons in Frame
+    Calculator
+  * a new oggstream playback plugin was added, along with new real-time
+    effects: RGB_delay, YUV_delay, and mask_overlay
+  * translations to Brazilian Portuguese, German, Italian and Ukrainian were
+    updated
+
+-------------------------------------------------------------------
 Wed Jun  8 21:45:30 UTC 2011 - pascal.bleser@opensuse.org
 
 - adding missing dependency on gtk2-devel to fix build
@@ -39,20 +53,24 @@
 Mon Sep 13 16:37:17 UTC 2010 - pascal@links2linux.de
 
 - update to 1.3.7:
-  * fixes an audio insertion error from 1.3.5 and 1.3.6; anyone using those versions is advised to upgrade
+  * fixes an audio insertion error from 1.3.5 and 1.3.6; anyone using those
+    versions is advised to upgrade
 
 -------------------------------------------------------------------
 Sun May  9 17:37:15 UTC 2010 - pascal@links2linux.de
 
 - update to 1.3.3:
-  * crashes after splitting/moving blocks in multitrack and with threading issues and effect previews were fixed
+  * crashes after splitting/moving blocks in multitrack and with threading
+    issues and effect previews were fixed
   * inserting and playing in multitrack have been optimized
-  * a full JACK timebase client has been implemented as well as improved A/V sync
+  * a full JACK timebase client has been implemented as well as improved A/V
+    sync
   * multitrack/mixer GUI improvements were made
   * video is now played back during "record external audio to selection"
   * CPU usage is reduced when paused in effects or encoding
   * image overlay effect was added into core rendered effects
-  * there is a new preferences layout and an "advanced" tab for TV card/Webcam input
+  * there is a new preferences layout and an "advanced" tab for TV card/Webcam
+    input
 
 -------------------------------------------------------------------
 Mon Mar 22 00:01:14 UTC 2010 - pascal@links2linux.de

LiVES.spec Changed

@@ -1,7 +1,7 @@
 # vim: set ts=4 sw=4 et:
 
 Name:           LiVES
-Version:        1.4.2
+Version:        1.4.3
 %define soname 0
 Release:        1
 Summary:        Video Editor and VJ Tool
@@ -31,6 +31,7 @@
 BuildRequires:  dirac-devel
 BuildRequires:  libpulse-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  libv4l-devel
 
 BuildRequires:  sox MPlayer xmms2 cdrkit-cdrtools-compat dvgrab
 
@@ -196,6 +197,8 @@
 %{_libdir}/lives/plugins/effects/realtime/weed/lifeTV.la
 %{_libdir}/lives/plugins/effects/realtime/weed/livetext.so
 %{_libdir}/lives/plugins/effects/realtime/weed/livetext.la
+%{_libdir}/lives/plugins/effects/realtime/weed/mask_overlay.so
+%{_libdir}/lives/plugins/effects/realtime/weed/mask_overlay.la
 %{_libdir}/lives/plugins/effects/realtime/weed/mirrors.so
 %{_libdir}/lives/plugins/effects/realtime/weed/mirrors.la
 %{_libdir}/lives/plugins/effects/realtime/weed/multi_blends.so
@@ -216,6 +219,8 @@
 %{_libdir}/lives/plugins/effects/realtime/weed/posterise.la
 %{_libdir}/lives/plugins/effects/realtime/weed/puretext.so
 %{_libdir}/lives/plugins/effects/realtime/weed/puretext.la
+%{_libdir}/lives/plugins/effects/realtime/weed/RGBdelay.so
+%{_libdir}/lives/plugins/effects/realtime/weed/RGBdelay.la
 %{_libdir}/lives/plugins/effects/realtime/weed/rippleTV.so
 %{_libdir}/lives/plugins/effects/realtime/weed/rippleTV.la
 %{_libdir}/lives/plugins/effects/realtime/weed/rotozoom.so
@@ -317,11 +322,15 @@
 %{_libdir}/lives/plugins/encoders/transcode_encoder
 %{_libdir}/lives/plugins/encoders/x264_encoder
 %dir %{_libdir}/lives/plugins/playback
+%dir %{_libdir}/lives/plugins/playback/audiostream
+%{_libdir}/lives/plugins/playback/audiostream/audiostreamer.pl
 %dir %{_libdir}/lives/plugins/playback/video
 %{_libdir}/lives/plugins/playback/video/SDL.so
 %{_libdir}/lives/plugins/playback/video/SDL.la
 %{_libdir}/lives/plugins/playback/video/lives2lives_stream.so
 %{_libdir}/lives/plugins/playback/video/lives2lives_stream.la
+%{_libdir}/lives/plugins/playback/video/oggstream.so
+%{_libdir}/lives/plugins/playback/video/oggstream.la
 %{_libdir}/lives/plugins/playback/video/vloopback.so
 %{_libdir}/lives/plugins/playback/video/vloopback.la
 %{_libdir}/lives/plugins/playback/video/yuv4mpeg_stream.so

LiVES-1.4.2.tar.bz2/ChangeLog -> LiVES-1.4.3.tar.bz2/ChangeLog Changed

LiVES-1.4.2.tar.bz2/README -> LiVES-1.4.3.tar.bz2/README Changed

LiVES-1.4.2.tar.bz2/build-lives-rfx-plugin -> LiVES-1.4.3.tar.bz2/build-lives-rfx-plugin Changed

LiVES-1.4.2.tar.bz2/configure -> LiVES-1.4.3.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.2.
+# Generated by GNU Autoconf 2.67 for LiVES 1.4.3.
 #
 # Report bugs to <http://www.sourceforge.net/tracker/?group_id=64341&atid=507139>.
 #
@@ -702,8 +702,8 @@
 # Identity of this package.
 PACKAGE_NAME='LiVES'
 PACKAGE_TARNAME='lives'
-PACKAGE_VERSION='1.4.2'
-PACKAGE_STRING='LiVES 1.4.2'
+PACKAGE_VERSION='1.4.3'
+PACKAGE_STRING='LiVES 1.4.3'
 PACKAGE_BUGREPORT='http://www.sourceforge.net/tracker/?group_id=64341&atid=507139'
 PACKAGE_URL=''
 
@@ -809,6 +809,8 @@
 HAVE_LIBDV_TRUE
 LIBDV_LIBS
 LIBDV_CFLAGS
+HAVE_LIBv4l1_FALSE
+HAVE_LIBv4l1_TRUE
 HAVE_UNICAP_FALSE
 HAVE_UNICAP_TRUE
 UNICAP_LIBS
@@ -1660,7 +1662,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures LiVES 1.4.2 to adapt to many kinds of systems.
+\`configure' configures LiVES 1.4.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1731,7 +1733,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of LiVES 1.4.2:";;
+     short | recursive ) echo "Configuration of LiVES 1.4.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1921,7 +1923,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-LiVES configure 1.4.2
+LiVES configure 1.4.3
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2522,7 +2524,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by LiVES $as_me 1.4.2, which was
+It was created by LiVES $as_me 1.4.3, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -3454,7 +3456,7 @@
 
 # Define the identity of the package.
  PACKAGE='lives'
- VERSION='1.4.2'
+ VERSION='1.4.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6156,13 +6158,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6159: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6161: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6162: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6164: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6165: output\"" >&5)
+  (eval echo "\"\$as_me:6167: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7367,7 +7369,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7370 "configure"' > conftest.$ac_ext
+  echo '#line 7372 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8627,11 +8629,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8630: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8632: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8634: \$? = $ac_status" >&5
+   echo "$as_me:8636: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8966,11 +8968,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8969: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8971: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8973: \$? = $ac_status" >&5
+   echo "$as_me:8975: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9071,11 +9073,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9074: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9076: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9078: \$? = $ac_status" >&5
+   echo "$as_me:9080: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9126,11 +9128,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9129: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9131: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9133: \$? = $ac_status" >&5
+   echo "$as_me:9135: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11510,7 +11512,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11513 "configure"
+#line 11515 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11606,7 +11608,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11609 "configure"
+#line 11611 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -20162,6 +20164,29 @@
 fi
 
 
+for ac_header in linux/videodev.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_videodev_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LINUX_VIDEODEV_H 1
+_ACEOF
+ HAVE_LIBv4l1=true
+else
+  HAVE_LIBv4l1=false
+fi
+
+done
+
+ if $HAVE_LIBv4l1; then
+  HAVE_LIBv4l1_TRUE=
+  HAVE_LIBv4l1_FALSE='#'
+else
+  HAVE_LIBv4l1_TRUE='#'
+  HAVE_LIBv4l1_FALSE=
+fi
+
+

LiVES-1.4.2.tar.bz2/configure.in -> LiVES-1.4.3.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.2,http://www.sourceforge.net/tracker/?group_id=64341&atid=507139)
+AC_INIT(LiVES,1.4.3,http://www.sourceforge.net/tracker/?group_id=64341&atid=507139)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
@@ -371,6 +371,10 @@
 
 AM_CONDITIONAL(HAVE_UNICAP,$HAVE_UNICAP)
 
+dnl Check of -lv4l1
+AC_CHECK_HEADERS(linux/videodev.h, HAVE_LIBv4l1=true, HAVE_LIBv4l1=false)
+AM_CONDITIONAL(HAVE_LIBv4l1,$HAVE_LIBv4l1)
+
 
 HAVE_LIBDV=false
 dnl check for libdv
@@ -498,7 +502,7 @@
 AM_CONDITIONAL(ENABLE_LDVGRAB,$HAVE_LDVGRAB)
 
 
-PKG_CHECK_MODULES(WEED, libweed >= 0.4.0, HAVE_SYSTEM_WEED=true, HAVE_SYSTEM_WEED=false)
+PKG_CHECK_MODULES(WEED, libweed >= 0.5.0, HAVE_SYSTEM_WEED=true, HAVE_SYSTEM_WEED=false)
 
 AC_SUBST(WEED_CFLAGS)
 AC_SUBST(WEED_LIBS)
@@ -506,7 +510,7 @@
 AM_CONDITIONAL(HAVE_SYSTEM_WEED,$HAVE_SYSTEM_WEED)
 
 
-PKG_CHECK_MODULES(WEED_SLICE, libweed_slice >= 0.4.0, HAVE_SYSTEM_WEED_SLICE=true, HAVE_SYSTEM_WEED_SLICE=false)
+PKG_CHECK_MODULES(WEED_SLICE, libweed_slice >= 0.5.0, HAVE_SYSTEM_WEED_SLICE=true, HAVE_SYSTEM_WEED_SLICE=false)
 
 if test "$HAVE_SYSTEM_WEED_SLICE" == "true"; then
 HAVE_SYSTEM_WEED=true
@@ -521,7 +525,7 @@
 WEED_MAKEFILES=libweed/Makefile
 fi
 
-PKG_CHECK_MODULES(WEED_UTILS, libweed-utils >= 0.4.0, HAVE_SYSTEM_WEED_UTILS=true, HAVE_SYSTEM_WEED_UTILS=false)
+PKG_CHECK_MODULES(WEED_UTILS, libweed-utils >= 0.5.0, HAVE_SYSTEM_WEED_UTILS=true, HAVE_SYSTEM_WEED_UTILS=false)
 
 AC_SUBST(WEED_UTILS_CFLAGS)
 AC_SUBST(WEED_UTILS_LIBS)
@@ -529,7 +533,7 @@
 AM_CONDITIONAL(HAVE_SYSTEM_WEED_UTILS,$HAVE_SYSTEM_WEED_UTILS)
 
 
-PKG_CHECK_MODULES(WEED_PLUGIN_UTILS, libweed-plugin-utils >= 0.4.0, HAVE_SYSTEM_WEED_PLUGIN_UTILS=true, HAVE_SYSTEM_WEED_PLUGIN_UTILS=false)
+PKG_CHECK_MODULES(WEED_PLUGIN_UTILS, libweed-plugin-utils >= 0.5.0, HAVE_SYSTEM_WEED_PLUGIN_UTILS=true, HAVE_SYSTEM_WEED_PLUGIN_UTILS=false)
 
 AC_SUBST(WEED_PLUGIN_UTILS_CFLAGS)
 AC_SUBST(WEED_PLUGIN_UTILS_LIBS)
@@ -559,6 +563,7 @@
 lives-plugins/plugins/decoders/Makefile
 lives-plugins/plugins/Makefile
 lives-plugins/plugins/playback/video/Makefile
+lives-plugins/plugins/playback/audiostream/Makefile
 lives-plugins/plugins/playback/Makefile
 lives-plugins/icons/Makefile
 lives-plugins/themes/cutting_room/Makefile

LiVES-1.4.2.tar.bz2/lives-plugins/plugins/playback/Makefile.am -> LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/Makefile.am Changed

LiVES-1.4.2.tar.bz2/lives-plugins/plugins/playback/Makefile.in -> LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/Makefile.in Changed

LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/audiostream Added

LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/audiostream/Makefile.am Added

LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/audiostream/Makefile.in Added

@@ -0,0 +1,530 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+#ls -1 | grep -v Makefile.am  | sed "s/$/ \\\\/g" >> Makefile.am
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = lives-plugins/plugins/playback/audiostream
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax.m4 \
+	$(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/mk/autoconf/acx_pthread.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(astreamdir)"
+DATA = $(astream_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIRAC_CFLAGS = @DIRAC_CFLAGS@
+DIRAC_LIBS = @DIRAC_LIBS@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_LIBS_NODYNAMIC = @GTK_LIBS_NODYNAMIC@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDV_CFLAGS = @LIBDV_CFLAGS@
+LIBDV_LIBS = @LIBDV_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBC = @LTLIBC@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
+MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OIL_CFLAGS = @OIL_CFLAGS@
+OIL_LIBS = @OIL_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@

LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/audiostream/audiostreamer.pl Added

@@ -0,0 +1,61 @@
+#!/usr/bin/perl
+
+# perl program to take audio input from $infifo, convert it to the 
+# specified format, and output it to $outfifo
+
+# (C) G. Finch 2011 - released under GPL v3 or higher
+
+
+if (!defined($ARGV[0])) {exit 1;}
+
+my $command=$ARGV[0];
+
+
+if ($command eq "get_formats") {
+    # list of formats separated by |
+    # see lives/src/plugins.h for values
+    print "3";
+    exit 0;
+}
+
+
+
+if ($command eq "play") {
+    my $result;
+    
+    my $format=$ARGV[1];
+    my $infifo=$ARGV[2];
+    my $outfifo=$ARGV[3];
+    my $arate=$ARGV[4];
+
+    # 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");
+	}
+	else {
+	    system("sox -t raw -r $arate -s -L -b 16 -c 2 $infifo -t vorbis $outfifo");
+	}
+    }
+    else {
+	exit 2;
+    }
+}
+
+if ($command eq "cleanup") {
+    # do any cleanup
+    my $format=$ARGV[1];
+    my $outfifo=$ARGV[2];
+
+    unlink $outfifo;
+
+}

LiVES-1.4.2.tar.bz2/lives-plugins/plugins/playback/video/Makefile.am -> LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/video/Makefile.am Changed

LiVES-1.4.2.tar.bz2/lives-plugins/plugins/playback/video/Makefile.in -> LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/video/Makefile.in Changed

@@ -103,6 +103,14 @@
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(lives2lives_stream_la_CFLAGS) $(CFLAGS) \
 	$(lives2lives_stream_la_LDFLAGS) $(LDFLAGS) -o $@
+oggstream_la_LIBADD =
+oggstream_la_SOURCES = oggstream.c
+oggstream_la_OBJECTS = oggstream_la-oggstream.lo
+oggstream_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(oggstream_la_CFLAGS) \
+	$(CFLAGS) $(oggstream_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_MJPEGTOOLS_TRUE@am_oggstream_la_rpath = -rpath \
+@HAVE_MJPEGTOOLS_TRUE@	$(videopluginslibdir)
 vjack_output_la_LIBADD =
 vjack_output_la_SOURCES = vjack_output.c
 vjack_output_la_OBJECTS = vjack_output_la-vjack_output.lo
@@ -141,10 +149,10 @@
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = SDL.c lives2lives_stream.c vjack_output.c vloopback.c \
-	yuv4mpeg_stream.c
-DIST_SOURCES = SDL.c lives2lives_stream.c vjack_output.c vloopback.c \
-	yuv4mpeg_stream.c
+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
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -377,6 +385,7 @@
 @FORCE_SDL_TRUE@@HAVE_SDL_FALSE@LDFLAGS_SDL = -lSDL
 @HAVE_SDL_TRUE@LDFLAGS_SDL = @SDL_LIBS@
 @HAVE_MJPEGTOOLS_TRUE@YUV4MPEG_libs = yuv4mpeg_stream.la
+@HAVE_MJPEGTOOLS_TRUE@oggstream_libs = oggstream.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
@@ -384,12 +393,14 @@
 lives2lives_stream_la_LDFLAGS = $(shared_ldflags)
 yuv4mpeg_stream_la_CFLAGS = @MJPEGTOOLS_CFLAGS@ $(shared_cflags) $(weed_cflags)
 yuv4mpeg_stream_la_LDFLAGS = $(shared_ldflags) @MJPEGTOOLS_LIBS@
+oggstream_la_CFLAGS = @MJPEGTOOLS_CFLAGS@ $(shared_cflags) $(weed_cflags)
+oggstream_la_LDFLAGS = $(shared_ldflags) @MJPEGTOOLS_LIBS@
 SDL_la_CFLAGS = $(shared_cflags) $(CFLAGS_SDL) $(weed_cflags)
 SDL_la_LDFLAGS = $(shared_ldflags) $(LDFLAGS_SDL)
 @IS_LINUX_GNU_TRUE@vloopback_libs = vloopback.la
 @IS_LINUX_GNU_TRUE@vloopback_la_CFLAGS = $(shared_cflags) $(weed_cflags)
 @IS_LINUX_GNU_TRUE@vloopback_la_LDFLAGS = $(shared_ldflags)
-videopluginslib_LTLIBRARIES = $(SDL_libs) $(YUV4MPEG_libs) $(vjack_output_libs) lives2lives_stream.la $(vloopback_libs)
+videopluginslib_LTLIBRARIES = $(SDL_libs) $(YUV4MPEG_libs) $(oggstream_libs) $(vjack_output_libs) lives2lives_stream.la $(vloopback_libs)
 EXTRA_DIST = videoplugin.h
 all: all-am
 
@@ -460,6 +471,8 @@
 	$(SDL_la_LINK) $(am_SDL_la_rpath) $(SDL_la_OBJECTS) $(SDL_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) 
+	$(oggstream_la_LINK) $(am_oggstream_la_rpath) $(oggstream_la_OBJECTS) $(oggstream_la_LIBADD) $(LIBS)
 vjack_output.la: $(vjack_output_la_OBJECTS) $(vjack_output_la_DEPENDENCIES) 
 	$(vjack_output_la_LINK) $(am_vjack_output_la_rpath) $(vjack_output_la_OBJECTS) $(vjack_output_la_LIBADD) $(LIBS)
 vloopback.la: $(vloopback_la_OBJECTS) $(vloopback_la_DEPENDENCIES) 
@@ -475,6 +488,7 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SDL_la-SDL.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@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vloopback_la-vloopback.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv4mpeg_stream_la-yuv4mpeg_stream.Plo@am__quote@
@@ -514,6 +528,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) $(lives2lives_stream_la_CFLAGS) $(CFLAGS) -c -o lives2lives_stream_la-lives2lives_stream.lo `test -f 'lives2lives_stream.c' || echo '$(srcdir)/'`lives2lives_stream.c
 
+oggstream_la-oggstream.lo: oggstream.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(oggstream_la_CFLAGS) $(CFLAGS) -MT oggstream_la-oggstream.lo -MD -MP -MF $(DEPDIR)/oggstream_la-oggstream.Tpo -c -o oggstream_la-oggstream.lo `test -f 'oggstream.c' || echo '$(srcdir)/'`oggstream.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/oggstream_la-oggstream.Tpo $(DEPDIR)/oggstream_la-oggstream.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='oggstream.c' object='oggstream_la-oggstream.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) $(oggstream_la_CFLAGS) $(CFLAGS) -c -o oggstream_la-oggstream.lo `test -f 'oggstream.c' || echo '$(srcdir)/'`oggstream.c
+
 vjack_output_la-vjack_output.lo: vjack_output.c
 @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vjack_output_la_CFLAGS) $(CFLAGS) -MT vjack_output_la-vjack_output.lo -MD -MP -MF $(DEPDIR)/vjack_output_la-vjack_output.Tpo -c -o vjack_output_la-vjack_output.lo `test -f 'vjack_output.c' || echo '$(srcdir)/'`vjack_output.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/vjack_output_la-vjack_output.Tpo $(DEPDIR)/vjack_output_la-vjack_output.Plo

LiVES-1.4.2.tar.bz2/lives-plugins/plugins/playback/video/SDL.c -> LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/video/SDL.c Changed

LiVES-1.4.2.tar.bz2/lives-plugins/plugins/playback/video/lives2lives_stream.c -> LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/video/lives2lives_stream.c Changed

LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/video/oggstream.c Added

@@ -0,0 +1,336 @@
+// LiVES - ogg/theora/vorbis 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 <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 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;
+} 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);
+}
+
+
+
+//////////////////////////////////////////////
+
+
+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);
+
+  return NULL;
+}
+
+
+const char *version (void) {
+  return plugin_version;
+}
+
+const char *get_description (void) {
+  return "The oggstream plugin provides realtime encoding to ogg/theora/vorbis format.\nIt requires ffmpeg2theora, oggTranscode and oggJoin.\nThe output file can be sent to a pipe or a file.\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, 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\
+output|Output _file|string|/tmp/output.ogv|1024|\\n\
+</params> \\n\
+<param_window> \\n\
+</param_window> \\n\
+<onchange> \\n\
+</onchange> \\n\
+";
+}
+
+const int *get_yuv_palette_clamping(int palette) {
+  if (palette==WEED_PALETTE_YUV420P) {
+    clampings[0]=WEED_YUV_CLAMPING_UNCLAMPED;
+    clampings[1]=WEED_YUV_CLAMPING_CLAMPED;
+    clampings[2]=-1;
+  }
+  else clampings[0]=-1;
+  return clampings;
+}
+
+
+boolean set_palette (int palette) {
+  if (!yuv4mpeg) return FALSE;
+  if (palette==WEED_PALETTE_YUV420P) {
+    mypalette=palette;
+    render_fn=&render_frame_yuv420;
+    return TRUE;
+  }
+  // invalid palette
+  return FALSE;
+}
+
+const char * get_fps_list (int palette) {
+  return "12|16|20|24|24000:1001|25|30000:1001|30|60";
+}
+
+
+boolean set_fps (double in_fps) {
+  if (in_fps>23.97599&&in_fps<23.9761) {
+    yuv4mpeg->fps=y4m_fps_NTSC_FILM;
+    return TRUE;
+  }
+  if (in_fps>=23.97&&in_fps<23.9701) {
+    yuv4mpeg->fps=y4m_fps_NTSC;
+    return TRUE;
+  }
+  yuv4mpeg->fps.n=(int)(in_fps);
+  yuv4mpeg->fps.d=1;
+  return TRUE;
+}
+
+static int audio;
+#include <errno.h>
+
+boolean init_screen (int width, int height, boolean fullscreen, uint32_t window_id, int argc, char **argv) {
+  int dummyvar;
+  const char *outfile;
+  char cmd[8192];
+  int afd;
+
+  int mypid=getpid();

LiVES-1.4.2.tar.bz2/lives-plugins/plugins/playback/video/videoplugin.h -> LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/video/videoplugin.h Changed

@@ -37,7 +37,7 @@
 const char *get_rfx (void);  ///< optional
 
 /// plugin send list of palettes, in order of preference
-int *get_palette_list(void);
+const int *get_palette_list(void);
 
 /// host sets the palette used
 boolean set_palette (int palette);
@@ -91,13 +91,13 @@
 // optional functions for yuv palettes
 
 /// plugin send list of palette sampling types, in order of preference (optional); -1 terminates list
-int *get_yuv_palette_sampling (int palette);
+const int *get_yuv_palette_sampling (int palette);
 
 /// plugin send list of palette clamping types, in order of preference (optional); -1 terminates list
-int *get_yuv_palette_clamping (int palette);
+const int *get_yuv_palette_clamping (int palette);
 
 /// plugin send list of palette subspace types, in order of preference (optional); -1 terminates list
-int *get_yuv_palette_subspace (int palette);
+const int *get_yuv_palette_subspace (int palette);
 
 /// host sets the palette sampling (optional)
 boolean set_yuv_palette_sampling (int sampling_type);
@@ -108,6 +108,13 @@
 /// host sets the palette subspace (optional)
 boolean set_yuv_palette_subspace (int subspace_type);
 
+// optional - supported audio streams :: defined in lives/src/plugins.h
+const int *get_audio_fmts(void);
+
+// ...may be expanded in the future to specify rates, #channels, sample size
+// signed/endian [get_raw_audio_fmts ?] 
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

LiVES-1.4.2.tar.bz2/lives-plugins/plugins/playback/video/vloopback.c -> LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/video/vloopback.c Changed

LiVES-1.4.2.tar.bz2/lives-plugins/plugins/playback/video/yuv4mpeg_stream.c -> LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/video/yuv4mpeg_stream.c Changed

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/Makefile.am -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/Makefile.am Changed

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/Makefile.in -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/Makefile.in Changed

@@ -89,6 +89,9 @@
 	"$(DESTDIR)$(libvispluginslibdir)"
 LTLIBRARIES = $(frei0rpluginslib_LTLIBRARIES) \
 	$(fxpluginslib_LTLIBRARIES) $(libvispluginslib_LTLIBRARIES)
+RGBdelay_la_LIBADD =
+RGBdelay_la_SOURCES = RGBdelay.c
+RGBdelay_la_OBJECTS = RGBdelay.lo
 alien_overlay_la_LIBADD =
 alien_overlay_la_SOURCES = alien_overlay.c
 alien_overlay_la_OBJECTS = alien_overlay.lo
@@ -224,15 +227,7 @@
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = alien_overlay.c audio_transition.c audio_volume.c blurzoom.c \
-	bump2d.c ccorrect.c colorkey.c comic.c deinterlace.c edge.c \
-	fg_bg_removal.c fireTV.c frei0r.c haip.c layout_blends.c \
-	libvis.c lifeTV.c livetext.c mirrors.c multi_blends.c \
-	multi_transitions.c negate.c noise.c onedTV.c palette_test.c \
-	plasma.c posterise.c rippleTV.c rotozoom.c simple_blend.c \
-	slide_over.c softlight.c targeted_zoom.c textfun.c tvpic.c \
-	vertigo.c warpTV.c xeffect.c
-DIST_SOURCES = alien_overlay.c audio_transition.c audio_volume.c \
+SOURCES = RGBdelay.c alien_overlay.c audio_transition.c audio_volume.c \
 	blurzoom.c bump2d.c ccorrect.c colorkey.c comic.c \
 	deinterlace.c edge.c fg_bg_removal.c fireTV.c frei0r.c haip.c \
 	layout_blends.c libvis.c lifeTV.c livetext.c mirrors.c \
@@ -240,6 +235,14 @@
 	palette_test.c plasma.c posterise.c rippleTV.c rotozoom.c \
 	simple_blend.c slide_over.c softlight.c targeted_zoom.c \
 	textfun.c tvpic.c vertigo.c warpTV.c xeffect.c
+DIST_SOURCES = RGBdelay.c alien_overlay.c audio_transition.c \
+	audio_volume.c blurzoom.c bump2d.c ccorrect.c colorkey.c \
+	comic.c deinterlace.c edge.c fg_bg_removal.c fireTV.c frei0r.c \
+	haip.c layout_blends.c libvis.c lifeTV.c livetext.c mirrors.c \
+	multi_blends.c multi_transitions.c negate.c noise.c onedTV.c \
+	palette_test.c plasma.c posterise.c rippleTV.c rotozoom.c \
+	simple_blend.c slide_over.c softlight.c targeted_zoom.c \
+	textfun.c tvpic.c vertigo.c warpTV.c xeffect.c
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -520,7 +523,8 @@
 @HAVE_FREI0R_TRUE@frei0r_la_CFLAGS = $(AM_CFLAGS)
 @HAVE_FREI0R_TRUE@frei0rpluginslibdir = $(libdir)/$(PACKAGE)/plugins/effects/realtime/weed/frei0r
 @HAVE_FREI0R_TRUE@frei0rpluginslib_LTLIBRARIES = $(frei0r_libs)
-fxpluginslib_LTLIBRARIES = alien_overlay.la \
+fxpluginslib_LTLIBRARIES = RGBdelay.la \
+	alien_overlay.la \
 	audio_transition.la \
 	audio_volume.la \
 	bump2d.la \
@@ -685,6 +689,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
+RGBdelay.la: $(RGBdelay_la_OBJECTS) $(RGBdelay_la_DEPENDENCIES) 
+	$(LINK) -rpath $(fxpluginslibdir) $(RGBdelay_la_OBJECTS) $(RGBdelay_la_LIBADD) $(LIBS)
 alien_overlay.la: $(alien_overlay_la_OBJECTS) $(alien_overlay_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(alien_overlay_la_OBJECTS) $(alien_overlay_la_LIBADD) $(LIBS)
 audio_transition.la: $(audio_transition_la_OBJECTS) $(audio_transition_la_DEPENDENCIES) 
@@ -768,6 +774,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RGBdelay.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alien_overlay.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_transition.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_volume.Plo@am__quote@

LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/RGBdelay.c Added

@@ -0,0 +1,377 @@
+// RGBdelay.c
+// weed plugin
+// (c) G. Finch (salsaman) 2011
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+
+#include <stdio.h>
+
+#ifdef HAVE_SYSTEM_WEED
+#include "weed/weed.h"
+#include "weed/weed-palettes.h"
+#include "weed/weed-effects.h"
+#include "weed/weed-plugin.h"
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-palettes.h"
+#include "../../libweed/weed-effects.h"
+#include "../../libweed/weed-plugin.h"
+#endif
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=2; // number of different weed api versions supported
+static int api_versions[]={131,100}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED
+#include "weed/weed-utils.h" // optional
+#include "weed/weed-plugin-utils.h" // optional
+#else
+#include "../../libweed/weed-utils.h" // optional
+#include "../../libweed/weed-plugin-utils.h" // optional
+#endif
+
+/////////////////////////////////////////////////////////////
+
+typedef struct {
+  int tcache;
+  int ccache;
+  unsigned char **cache;
+  int *is_bgr;
+} _sdata;
+
+
+int RGBd_init(weed_plant_t *inst) {
+  int error;
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error),*gui,*ptmpl;
+  weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
+  int width=weed_get_int_value(in_channel,"width",&error);
+  int height=weed_get_int_value(in_channel,"height",&error);
+  int ncache=weed_get_int_value(in_params[0],"value",&error);
+  register int i;
+
+  _sdata *sdata=(_sdata *)weed_malloc(sizeof(_sdata));
+
+  if (sdata==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+
+  ncache++; // add 1 for current frame
+
+  sdata->is_bgr=weed_malloc(ncache*sizeof(int));
+
+  if (sdata->is_bgr==NULL) {
+    weed_free(sdata);
+    return WEED_ERROR_MEMORY_ALLOCATION;
+  }
+
+  for (i=0;i<ncache;i++) {
+    sdata->is_bgr[i]=0;
+  }
+
+  // create frame cache
+
+  sdata->cache=(unsigned char **)weed_malloc(ncache*sizeof(unsigned char *));
+  if (sdata->cache==NULL) {
+    weed_free(sdata->is_bgr);
+    weed_free(sdata);
+    return WEED_ERROR_MEMORY_ALLOCATION;
+  }
+
+  for (i=0;i<ncache;i++) {
+    sdata->cache[i]=weed_malloc(width*height*3);
+    if (sdata->cache[i]==NULL) {
+      for(--i;i>=0;i--) weed_free(sdata->cache[i]);
+      weed_free(sdata->cache);
+      weed_free(sdata->is_bgr);
+      weed_free(sdata);
+      return WEED_ERROR_MEMORY_ALLOCATION;
+    }
+  }
+
+
+  sdata->ccache=0;
+  sdata->tcache=ncache;
+
+  ncache*=4;
+
+  for (i=0;i<205;i++) {
+    ptmpl=weed_get_plantptr_value(in_params[i],"template",&error);
+    gui=weed_parameter_template_get_gui(ptmpl);
+    weed_set_boolean_value(gui,"hidden",i>ncache?WEED_TRUE:WEED_FALSE);
+  }
+
+  weed_free(in_params);
+
+  weed_set_voidptr_value(inst,"plugin_internal",sdata);
+
+  return WEED_NO_ERROR;
+}
+
+
+
+int RGBd_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  int error;
+  weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error),*out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  unsigned char *src=weed_get_voidptr_value(in_channel,"pixel_data",&error),*osrc;
+  unsigned char *dst=weed_get_voidptr_value(out_channel,"pixel_data",&error),*odst;
+  int width=weed_get_int_value(in_channel,"width",&error)*3;
+  int height=weed_get_int_value(in_channel,"height",&error);
+  int palette=weed_get_int_value(in_channel,"current_palette",&error);
+  int irowstride=weed_get_int_value(in_channel,"rowstrides",&error);
+  int orowstride=weed_get_int_value(out_channel,"rowstrides",&error);
+  unsigned char *end=src+height*irowstride;
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_internal",&error);
+  register int i,j;
+  void *tmptr=NULL;
+  double tstra=0.,tstrb=0.,tstrc=0.,cstr,cstra,cstrb,cstrc;
+  int a=1,b=2,c=3,crossed;
+  size_t x=0;
+  int inplace=(src==dst);
+  int b1,b2,b3;
+
+  for (i=sdata->ccache;i>0;i--) {
+    if (i==sdata->tcache) continue;
+
+    if (i==sdata->tcache-1||i==sdata->ccache) {
+      tmptr=sdata->cache[0];
+      sdata->cache[0]=sdata->cache[i]; // recycle last frame
+    }
+    sdata->cache[i]=sdata->cache[i-1];
+    sdata->is_bgr[i]=sdata->is_bgr[i-1];
+
+    // normalise the blend strength for each colour channel
+    if (weed_get_boolean_value(in_params[i*4+1],"value",&error)==WEED_TRUE) {
+      if (sdata->is_bgr[i])
+	tstrc+=weed_get_double_value(in_params[(i+1)*4],"value",&error);
+      else tstra+=weed_get_double_value(in_params[(i+1)*4],"value",&error);
+    }
+
+    if (weed_get_boolean_value(in_params[i*4+2],"value",&error)==WEED_TRUE)
+      tstrb+=weed_get_double_value(in_params[(i+1)*4],"value",&error);
+
+    if (weed_get_boolean_value(in_params[i*4+3],"value",&error)==WEED_TRUE) {
+      if (sdata->is_bgr[i])
+	tstra+=weed_get_double_value(in_params[(i+1)*4],"value",&error);
+      else tstrc+=weed_get_double_value(in_params[(i+1)*4],"value",&error);
+    }
+    
+  }
+
+  if (tmptr!=NULL) sdata->cache[1]=tmptr; // value of cache[0] got squished
+
+  if (palette==WEED_PALETTE_BGR24) {
+    // red/blue values swapped
+    sdata->is_bgr[0]=1;
+    a=3;
+    c=1;
+  }
+  else sdata->is_bgr[0]=0;
+
+  sdata->ccache+=(sdata->ccache < sdata->tcache);
+
+
+  osrc=src;
+  odst=dst;
+
+  a=1;
+  b=2;
+  c=3;
+
+  if (palette==WEED_PALETTE_BGR24) {
+    a=3;
+    c=1;
+  }
+
+  b1=weed_get_boolean_value(in_params[a],"value",&error);
+  b2=weed_get_boolean_value(in_params[b],"value",&error);
+  b3=weed_get_boolean_value(in_params[c],"value",&error);
+
+  if (b1==WEED_TRUE||b2==WEED_TRUE||b3==WEED_TRUE||inplace) {
+
+    if (b1==WEED_TRUE)
+      tstra+=weed_get_double_value(in_params[4],"value",&error);
+    if (b2==WEED_TRUE)

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/alien_overlay.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/alien_overlay.c Changed

@@ -94,6 +94,18 @@
 
   sdata=weed_get_voidptr_value(inst,"plugin_internal",&error);
   old_pixel_data=sdata->old_pixel_data;
+
+  // 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);
+
+    src+=offset*irowstride;
+    dst+=offset*orowstride;
+    end=src+dheight*irowstride;
+    old_pixel_data+=width*offset;
+    }*/
+
   for (;src<end;src+=irowstride) {
     for (j=0;j<width;j++) {
       if (sdata->inited) {
@@ -126,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,WEED_FILTER_HINT_IS_POINT_EFFECT,&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,0,&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.2.tar.bz2/lives-plugins/weed-plugins/ccorrect.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/ccorrect.c Changed

@@ -56,6 +56,16 @@
 
   unsigned int r,g,b;
 
+  // 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);
+
+    src+=offset*irowstride;
+    dst+=offset*orowstride;
+    end=src+dheight*irowstride;
+  }
+
   for (;src<end;src+=irowstride) {
     for (i=0;i<width;i+=3) {
       if (palette==WEED_PALETTE_BGR24) {
@@ -93,7 +103,7 @@
 
     weed_plant_t *in_params[]={weed_float_init("red","_Red factor",1.0,0.0,2.0),weed_float_init("green","_Green factor",1.0,0.0,2.0),weed_float_init("blue","_Blue factor",1.0,0.0,2.0),NULL};
 
-    weed_plant_t *filter_class=weed_filter_class_init("colour correction","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,NULL,&ccorect_process,NULL,in_chantmpls,out_chantmpls,in_params,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("colour correction","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&ccorect_process,NULL,in_chantmpls,out_chantmpls,in_params,NULL);
 
     weed_plugin_info_add_filter_class (plugin_info,filter_class);

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/fg_bg_removal.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/fg_bg_removal.c Changed

@@ -202,6 +202,16 @@
   int inplace=(src==dest);
   register int j;
 
+  // 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);
+
+    src+=offset*irowstride;
+    dest+=offset*orowstride;
+    end=src+dheight*irowstride;
+  }
+
   in_param=weed_get_plantptr_value(inst,"in_parameters",&error);
   bf=weed_get_int_value(in_param,"value",&error);
   luma_threshold=(uint8_t)bf;
@@ -264,23 +274,32 @@
 weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
   weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
 
+  weed_plant_t **clone1,**clone2,**clone3;
+
   if (plugin_info!=NULL) {
     int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_END};
     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 *in_params[]={weed_integer_init("threshold","_Threshold",64,0,255),NULL};
-    weed_plant_t *filter_class=weed_filter_class_init("fg_bg_removal type 1","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,&common_init,&t1_process,&common_deinit,in_chantmpls,out_chantmpls,in_params,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("fg_bg_removal type 1","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,&common_init,&t1_process,&common_deinit,in_chantmpls,out_chantmpls,in_params,NULL);
     
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
 
     // we must clone the arrays for the next filter
-    filter_class=weed_filter_class_init("fg_bg_removal type 2","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,&common_init,&t2_process,&common_deinit,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),weed_clone_plants(in_params),NULL);
+    filter_class=weed_filter_class_init("fg_bg_removal type 2","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,&common_init,&t2_process,&common_deinit,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params)),NULL);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_free(clone1);
+    weed_free(clone2);
+    weed_free(clone3);
+
 
     // we must clone the arrays for the next filter
-    filter_class=weed_filter_class_init("fg_bg_removal type 3","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,&common_init,&t3_process,&common_deinit,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),weed_clone_plants(in_params),NULL);
+    filter_class=weed_filter_class_init("fg_bg_removal type 3","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,&common_init,&t3_process,&common_deinit,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params)),NULL);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_free(clone1);
+    weed_free(clone2);
+    weed_free(clone3);
     
     weed_set_int_value(plugin_info,"version",package_version);
     init_RGB_to_YCbCr_tables();

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.am -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.am Changed

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.in -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.in Changed

@@ -92,6 +92,9 @@
 gdk_fast_resize_la_LIBADD =
 gdk_fast_resize_la_SOURCES = gdk_fast_resize.c
 gdk_fast_resize_la_OBJECTS = gdk_fast_resize.lo
+mask_overlay_la_LIBADD =
+mask_overlay_la_SOURCES = mask_overlay.c
+mask_overlay_la_OBJECTS = mask_overlay.lo
 puretext_la_LIBADD =
 puretext_la_SOURCES = puretext.c
 puretext_la_OBJECTS = puretext.lo
@@ -121,10 +124,10 @@
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = compositor.c gdk_fast_resize.c puretext.c scribbler.c \
-	videowall.c vjack_rcv.c
-DIST_SOURCES = compositor.c gdk_fast_resize.c puretext.c scribbler.c \
-	videowall.c vjack_rcv.c
+SOURCES = compositor.c gdk_fast_resize.c mask_overlay.c puretext.c \
+	scribbler.c videowall.c vjack_rcv.c
+DIST_SOURCES = compositor.c gdk_fast_resize.c mask_overlay.c \
+	puretext.c scribbler.c videowall.c vjack_rcv.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -355,7 +358,7 @@
 AM_CFLAGS = $(shared_cflags) $(weed_CFLAGS) @GTK_CFLAGS@ -ffast-math
 @ENABLE_VJACK_TRUE@vjack_libs = vjack_rcv.la
 @ENABLE_VJACK_TRUE@vjack_rcv_la_LDFLAGS = -ljack $(AM_LDFLAGS)
-fxpluginslib_LTLIBRARIES = gdk_fast_resize.la compositor.la videowall.la scribbler.la puretext.la $(vjack_libs) 
+fxpluginslib_LTLIBRARIES = gdk_fast_resize.la compositor.la videowall.la scribbler.la puretext.la mask_overlay.la $(vjack_libs) 
 EXTRA_DIST = data icons
 all: all-am
 
@@ -426,6 +429,8 @@
 	$(LINK) -rpath $(fxpluginslibdir) $(compositor_la_OBJECTS) $(compositor_la_LIBADD) $(LIBS)
 gdk_fast_resize.la: $(gdk_fast_resize_la_OBJECTS) $(gdk_fast_resize_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(gdk_fast_resize_la_OBJECTS) $(gdk_fast_resize_la_LIBADD) $(LIBS)
+mask_overlay.la: $(mask_overlay_la_OBJECTS) $(mask_overlay_la_DEPENDENCIES) 
+	$(LINK) -rpath $(fxpluginslibdir) $(mask_overlay_la_OBJECTS) $(mask_overlay_la_LIBADD) $(LIBS)
 puretext.la: $(puretext_la_OBJECTS) $(puretext_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(puretext_la_OBJECTS) $(puretext_la_LIBADD) $(LIBS)
 scribbler.la: $(scribbler_la_OBJECTS) $(scribbler_la_DEPENDENCIES) 
@@ -443,6 +448,7 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compositor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdk_fast_resize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mask_overlay.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/puretext.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scribbler.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/videowall.Plo@am__quote@

LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/gdk/mask_overlay.c Added

@@ -0,0 +1,351 @@
+// mask_overlay.c
+// weed plugin - resize using gdk
+// (c) G. Finch (salsaman) 2011
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+
+#ifdef HAVE_SYSTEM_WEED
+#include "weed/weed.h"
+#include "weed/weed-palettes.h"
+#include "weed/weed-effects.h"
+#include "weed/weed-plugin.h"
+#else
+#include "../../../libweed/weed.h"
+#include "../../../libweed/weed-palettes.h"
+#include "../../../libweed/weed-effects.h"
+#include "../../../libweed/weed-plugin.h"
+#endif
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131,100}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED
+#include "weed/weed-utils.h" // optional
+#include "weed/weed-plugin-utils.h" // optional
+#else
+#include "../../../libweed/weed-utils.h" // optional
+#include "../../../libweed/weed-plugin-utils.h" // optional
+#endif
+
+/////////////////////////////////////////////////////////////
+
+typedef struct _sdata {
+  int *xmap; // x offset in src0 to map to point (or -1 to map src1)
+  int *ymap; // x offset in src0 to map to point (or -1 to map src1)
+} sdata;
+
+
+
+#include <gdk/gdk.h>
+
+
+
+//inline int calc_luma(unsigned char *pt) {
+  // return luma 0<=x<=256
+//  return 0.21*(float)pt[0]+0.587*(float)pt[1]+0.114*(float)pt[2];
+//}
+
+
+
+static void make_mask(GdkPixbuf *pbuf, int mode, int owidth, int oheight, int *xmap, int *ymap) {
+  int iwidth=gdk_pixbuf_get_width(pbuf);
+  int iheight=gdk_pixbuf_get_height(pbuf);
+  gboolean has_alpha=gdk_pixbuf_get_has_alpha(pbuf);
+  int stride=gdk_pixbuf_get_rowstride(pbuf);
+  guchar *pdata=gdk_pixbuf_get_pixels(pbuf);
+
+  double xscale=(double)iwidth/(double)owidth;
+  double yscale=(double)iheight/(double)oheight;
+
+  double xscale2,yscale2;
+
+  int psize=3;
+
+  int top=-1,bot=-1,left=-1,right=-1,tline,xwidth=0;
+  double xpos=0.,ypos=0.;
+
+  register int i,j;
+
+  if (has_alpha) psize=4;
+
+  if (mode==1) {
+    // get bounds
+
+    for (i=0;i<oheight;i++) {
+      for (j=0;j<owidth;j++) {
+	if ( *(pdata + (int)(i * yscale) * stride + (int)(j * xscale) * psize + 1) == 0) {
+	  if (top==-1) top=i;
+	  if (j<left||left==-1) left=j;
+	  if (j>right) right=j;
+	  if (i>bot) bot=i;
+	}
+      }
+    }
+
+    // get width (ignoring non-black)
+
+    tline=(top+bot)>>1;
+
+    for (j=0;j<owidth;j++) {
+      if ( *(pdata + (int)(tline * yscale) * stride + (int)(j * xscale) * psize + 1) == 0) xwidth++;
+    }
+    
+    yscale2=(double)oheight/(double)(bot-top);
+    xscale2=(double)owidth/(double)xwidth;
+
+    // map center row as template for other rows
+    for (j=0;j<owidth;j++) {
+      if ( *(pdata + (int)(tline * yscale) * stride + (int)(j * xscale) * psize + 1) == 0) {
+	// map front frame
+	xmap[tline*owidth+j]=(int)xpos;
+	xpos+=xscale2;
+      }
+      else {
+	xmap[tline*owidth+j]=-1;
+      }
+    }
+  }
+
+  for (i=0;i<oheight;i++) {
+
+    for (j=0;j<owidth;j++) {
+      if ( *(pdata + (int)(i * yscale) * stride + (int)(j * xscale) * psize + 1) == 0) {
+	// map front frame
+
+	if (mode==0) {
+	  // no re-mapping of front frame
+	  xmap[i*owidth+j]=j;
+	  ymap[i*owidth+j]=i;
+	}
+	else {
+	  xmap[i*owidth+j]=xmap[tline*owidth+j];
+	  ymap[i*owidth+j]=(int)ypos;
+	}
+
+      }
+      else {
+	// map back frame
+	xmap[i*owidth+j]=ymap[i*owidth+j]=-1;
+      }
+
+    }
+    if (i>=top) ypos+=yscale2;
+  }
+
+}
+
+
+
+
+
+
+
+
+int masko_init(weed_plant_t *inst) {
+  struct _sdata *sdata;
+  int video_height,video_width,video_area;
+  int error,mode;
+  weed_plant_t *in_channel,**in_params;
+  GdkPixbuf *pbuf;
+  GError *gerr=NULL;
+  char *mfile;
+
+  in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
+
+  sdata=weed_malloc(sizeof(struct _sdata));
+
+  if (sdata == NULL ) return WEED_ERROR_MEMORY_ALLOCATION;
+
+  video_height=weed_get_int_value(in_channel,"height",&error);
+  video_width=weed_get_int_value(in_channel,"width",&error);
+  video_area=video_width*video_height;
+
+
+  sdata->xmap=(int *)weed_malloc(video_area*sizeof(int));
+
+  if (sdata->xmap == NULL ) {
+    weed_free(sdata);
+    return WEED_ERROR_MEMORY_ALLOCATION;
+  }
+
+  sdata->ymap=(int *)weed_malloc(video_area*sizeof(int));
+
+  if (sdata->ymap == NULL ) {
+    weed_free(sdata->xmap);
+    weed_free(sdata);
+    return WEED_ERROR_MEMORY_ALLOCATION;
+  }
+
+  // load image, then get luma values and scale
+  in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  mfile=weed_get_string_value(in_params[0],"value",&error);
+  mode=weed_get_int_value(in_params[1],"value",&error);
+
+  pbuf=gdk_pixbuf_new_from_file(mfile,&gerr);
+
+  if (gerr!=NULL) {
+    weed_free(sdata->xmap);
+    weed_free(sdata->ymap);
+    g_object_unref(gerr);
+    sdata->xmap=sdata->ymap=NULL;
+  }

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/gdk/scribbler.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/gdk/scribbler.c Changed

@@ -339,8 +339,9 @@
 
 weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
   weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  weed_plant_t **clone1,**clone2;
 
-  static char *def_fonts[] = {"serif", NULL};
+  char *def_fonts[] = {"serif", NULL};
   if (plugin_info!=NULL) {
     char *modes[]={"foreground only","foreground and background","background only",NULL};
     // removed palettes with alpha channel
@@ -416,8 +417,10 @@
 
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
 
-    filter_class=weed_filter_class_init("scribbler_generator","Aleksej Penkov",1,0,&scribbler_init,&scribbler_process,NULL,NULL,weed_clone_plants(out_chantmpls),weed_clone_plants(in_params),NULL);
-    
+    filter_class=weed_filter_class_init("scribbler_generator","Aleksej Penkov",1,0,&scribbler_init,&scribbler_process,NULL,NULL,(clone1=weed_clone_plants(out_chantmpls)),(clone2=weed_clone_plants(in_params)),NULL);
+    weed_free(clone1);
+    weed_free(clone2);
+
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
     weed_set_double_value(filter_class,"target_fps",25.); // set reasonable default fps

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/livetext.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/livetext.c Changed

@@ -348,6 +348,7 @@
 
 weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
   weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  weed_plant_t **clone1,**clone2;
 
   if (plugin_info!=NULL) {
     char *modes[]={"foreground only","foreground and background","background only",NULL};
@@ -383,8 +384,10 @@
 
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
 
-    filter_class=weed_filter_class_init("livetext_generator","salsaman",1,0,NULL,&livetext_process,NULL,NULL,weed_clone_plants(out_chantmpls),weed_clone_plants(in_params),NULL);
-    
+    filter_class=weed_filter_class_init("livetext_generator","salsaman",1,0,NULL,&livetext_process,NULL,NULL,(clone1=weed_clone_plants(out_chantmpls)),(clone2=weed_clone_plants(in_params)),NULL);
+    weed_free(clone1);
+    weed_free(clone2);
+
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
     weed_set_double_value(filter_class,"target_fps",25.); // set reasonable default fps

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/mirrors.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/mirrors.c Changed

@@ -112,6 +112,8 @@
 
 weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
   weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  weed_plant_t **clone1,**clone2;
+
   if (plugin_info!=NULL) {
     int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_END};
 
@@ -121,11 +123,15 @@
     weed_plant_t *filter_class=weed_filter_class_init("mirrorx","salsaman",1,0,NULL,&mirrorx_process,NULL,in_chantmpls,out_chantmpls,NULL,NULL);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
     
-    filter_class=weed_filter_class_init("mirrory","salsaman",1,0,NULL,&mirrory_process,NULL,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),NULL,NULL);
+    filter_class=weed_filter_class_init("mirrory","salsaman",1,0,NULL,&mirrory_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),NULL,NULL);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_free(clone1);
+    weed_free(clone2);
 
-    filter_class=weed_filter_class_init("mirrorxy","salsaman",1,0,NULL,&mirrorxy_process,NULL,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),NULL,NULL);
+    filter_class=weed_filter_class_init("mirrorxy","salsaman",1,0,NULL,&mirrorxy_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),NULL,NULL);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_free(clone1);
+    weed_free(clone2);
 
     weed_set_int_value(plugin_info,"version",package_version);
   }

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/multi_blends.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/multi_blends.c Changed

@@ -152,6 +152,20 @@
   blend2=(255-blend_factor)*2;
   blendneg2=(blend_factor-128)*2;
 
+  // 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) {
       switch (type) {
@@ -290,35 +304,55 @@
 
 weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
   weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  weed_plant_t **clone1,**clone2,**clone3;
+
   if (plugin_info!=NULL) {
     int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_END};
     weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),weed_channel_template_init("in channel 1",0,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 *in_params1[]={weed_integer_init("amount","Blend _amount",128,0,255),NULL};
 
-    weed_plant_t *filter_class=weed_filter_class_init("blend_multiply","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,NULL,&mpy_process,NULL,in_chantmpls,out_chantmpls,in_params1,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("blend_multiply","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&mpy_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("blend_screen","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,NULL,&screen_process,NULL,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),weed_clone_plants(in_params1),NULL);
+    filter_class=weed_filter_class_init("blend_screen","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&screen_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);
+    weed_free(clone3);
 
-    filter_class=weed_filter_class_init("blend_darken","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,NULL,&darken_process,NULL,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),weed_clone_plants(in_params1),NULL);
+    filter_class=weed_filter_class_init("blend_darken","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&darken_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);
+    weed_free(clone3);
 
-    filter_class=weed_filter_class_init("blend_lighten","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,NULL,&lighten_process,NULL,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),weed_clone_plants(in_params1),NULL);
+    filter_class=weed_filter_class_init("blend_lighten","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&lighten_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);
+    weed_free(clone3);
 
-    filter_class=weed_filter_class_init("blend_overlay","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,NULL,&overlay_process,NULL,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),weed_clone_plants(in_params1),NULL);
+    filter_class=weed_filter_class_init("blend_overlay","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&overlay_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);
+    weed_free(clone3);
 
-    filter_class=weed_filter_class_init("blend_dodge","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,NULL,&dodge_process,NULL,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),weed_clone_plants(in_params1),NULL);
+    filter_class=weed_filter_class_init("blend_dodge","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&dodge_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);
+    weed_free(clone3);
 
-    filter_class=weed_filter_class_init("blend_burn","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,NULL,&burn_process,NULL,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),weed_clone_plants(in_params1),NULL);
+    filter_class=weed_filter_class_init("blend_burn","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&burn_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);
+    weed_free(clone3);
 
     weed_set_int_value(plugin_info,"version",package_version);

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/multi_transitions.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/multi_transitions.c Changed

@@ -244,6 +244,8 @@
 
 weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
   weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  weed_plant_t **clone1,**clone2,**clone3;
+
   if (plugin_info!=NULL) {
     int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,WEED_PALETTE_ARGB32,WEED_PALETTE_YUV888,WEED_PALETTE_YUVA8888,WEED_PALETTE_END};
     weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),weed_channel_template_init("in channel 1",0,palette_list),NULL};
@@ -256,20 +258,29 @@
 
     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,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),weed_clone_plants(in_params1),NULL);
+    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);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_free(clone1);
+    weed_free(clone2);
+    weed_free(clone3);
 
 
     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,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),weed_clone_plants(in_params1),NULL);
+    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);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_free(clone1);
+    weed_free(clone2);
+    weed_free(clone3);
 
 
     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,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),weed_clone_plants(in_params1),NULL);
+    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);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_free(clone1);
+    weed_free(clone2);
+    weed_free(clone3);
 
     weed_set_int_value(plugin_info,"version",package_version);
   }

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/negate.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/negate.c Changed

@@ -49,6 +49,16 @@
   unsigned char *end=src+height*irowstride;
   register int i;
 
+  // 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);
+
+    src+=offset*irowstride;
+    dst+=offset*orowstride;
+    end=src+dheight*irowstride;
+  }
+
   for (;src<end;src+=irowstride) {
     for (i=0;i<width;i++) {
       dst[i]=src[i]^0xFF;
@@ -68,7 +78,7 @@
 
     weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,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("negate","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,NULL,&negate_process,NULL,in_chantmpls,out_chantmpls,NULL,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("negate","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&negate_process,NULL,in_chantmpls,out_chantmpls,NULL,NULL);
 
     weed_plugin_info_add_filter_class (plugin_info,filter_class);

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/noise.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/noise.c Changed

@@ -86,6 +86,15 @@
   static_data *sdata=weed_get_voidptr_value(inst,"plugin_internal",&error);
   sdata->fastrand_val=timestamp&0x0000FFFF;
 
+  // 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);
+
+    src+=offset*irowstride;
+    dst+=offset*orowstride;
+    end=src+dheight*irowstride;
+  }
 
   for (;src<end;src+=irowstride) {
     for (j=0;j<width;j++) {
@@ -105,7 +114,7 @@
     weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,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("noise","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,&noise_init,&noise_process,&noise_deinit,in_chantmpls,out_chantmpls,NULL,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("noise","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,&noise_init,&noise_process,&noise_deinit,in_chantmpls,out_chantmpls,NULL,NULL);
 
     weed_plugin_info_add_filter_class (plugin_info,filter_class);

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/palette_test.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/palette_test.c Changed

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/posterise.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/posterise.c Changed

@@ -56,6 +56,16 @@
 
   for (i=1;i<levels;i++) levmask+=128>>i;
 
+  // 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);
+
+    src+=offset*irowstride;
+    dst+=offset*orowstride;
+    end=src+dheight*irowstride;
+  }
+
   for (;src<end;src+=irowstride) {
     for (i=0;i<width;i++) {
       dst[i]=src[i]&levmask;
@@ -76,7 +86,7 @@
     weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE,palette_list),NULL};
     weed_plant_t *in_params[]={weed_integer_init("levels","Colour _levels",1,1,8),NULL};
     
-    weed_plant_t *filter_class=weed_filter_class_init("posterise","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,NULL,&posterise_process,NULL,in_chantmpls,out_chantmpls,in_params,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("posterise","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&posterise_process,NULL,in_chantmpls,out_chantmpls,in_params,NULL);
 
     weed_plugin_info_add_filter_class (plugin_info,filter_class);

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/simple_blend.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/simple_blend.c Changed

@@ -1,6 +1,6 @@
 // simple_blend.c
 // weed plugin
-// (c) G. Finch (salsaman) 2005
+// (c) G. Finch (salsaman) 2005 - 2011
 //
 // released under the GNU GPL 3 or later
 // see file COPYING or www.gnu.org for details
@@ -147,6 +147,20 @@
   blend_factor=(unsigned char)bf;
   blendneg=blend_factor^0xFF;
   
+
+  // 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) {
       switch (type) {
@@ -205,6 +219,8 @@
 
 weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
   weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  weed_plant_t **clone1,**clone2,**clone3;
+
   if (plugin_info!=NULL) {
     int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_END};
     weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),weed_channel_template_init("in channel 1",0,palette_list),NULL};
@@ -212,21 +228,29 @@
     weed_plant_t *in_params1[]={weed_integer_init("amount","Blend _amount",128,0,255),NULL};
     weed_plant_t *in_params2[]={weed_integer_init("threshold","luma _threshold",64,0,255),NULL};
 
-    weed_plant_t *filter_class=weed_filter_class_init("chroma blend","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,&common_init,&chroma_process,NULL,in_chantmpls,out_chantmpls,in_params1,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("chroma blend","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,&common_init,&chroma_process,NULL,in_chantmpls,out_chantmpls,in_params1,NULL);
 
     weed_set_boolean_value(in_params1[0],"transition",WEED_TRUE);
     weed_set_boolean_value(in_params2[0],"transition",WEED_TRUE);
 
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
 
-    filter_class=weed_filter_class_init("luma overlay","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,&common_init,&lumo_process,NULL,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),in_params2,NULL);
+    filter_class=weed_filter_class_init("luma overlay","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,&common_init,&lumo_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),in_params2,NULL);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_free(clone1);
+    weed_free(clone2);
 
-    filter_class=weed_filter_class_init("luma underlay","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,&common_init,&lumu_process,NULL,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),weed_clone_plants(in_params2),NULL);
+    filter_class=weed_filter_class_init("luma underlay","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,&common_init,&lumu_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params2)),NULL);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_free(clone1);
+    weed_free(clone2);
+    weed_free(clone3);
 
-    filter_class=weed_filter_class_init("negative luma overlay","salsaman",1,WEED_FILTER_HINT_IS_POINT_EFFECT,&common_init,&nlumo_process,NULL,weed_clone_plants(in_chantmpls),weed_clone_plants(out_chantmpls),weed_clone_plants(in_params2),NULL);
+    filter_class=weed_filter_class_init("negative luma overlay","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,&common_init,&nlumo_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params2)),NULL);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_free(clone1);
+    weed_free(clone2);
+    weed_free(clone3);
 
     weed_set_int_value(plugin_info,"version",package_version);

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/targeted_zoom.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/targeted_zoom.c Changed

@@ -60,6 +60,8 @@
 
   int sy;
 
+  int offset=0,dheight=height;
+
   register int x,y;
 
   in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
@@ -78,7 +80,14 @@
   offsx*=width;
   offsy*=height;
 
-  for (y=0;y<height;y++) {
+  // new threading arch
+  if (weed_plant_has_leaf(out_channel,"offset")) {
+    offset=weed_get_int_value(out_channel,"offset",&error);
+    dheight=weed_get_int_value(out_channel,"height",&error);
+    dst+=offset*orowstride;
+  }
+
+  for (y=offset;y<dheight;y++) {
     dy=(int)((double)y-offsy)/scale+offsy;
     sy=dy*irowstride;
     dr=y*orowstride;
@@ -103,7 +112,7 @@
 
     weed_plant_t *in_params[]={weed_float_init("scale","_Scale",1.,1.,16.),weed_float_init("xoffs","_X offset",0.5,0.,1.),weed_float_init("yoffs","_Y offset",0.5,0.,1.),NULL};
 
-    weed_plant_t *filter_class=weed_filter_class_init("targeted zoom","salsaman",1,0,NULL,&tzoom_process,NULL,in_chantmpls,out_chantmpls,in_params,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("targeted zoom","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&tzoom_process,NULL,in_chantmpls,out_chantmpls,in_params,NULL);
 
     weed_plant_t *gui=weed_filter_class_get_gui(filter_class);

LiVES-1.4.2.tar.bz2/lives-plugins/weed-plugins/tvpic.c -> LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/tvpic.c Changed

@@ -56,6 +56,16 @@
 
   width*=offs;
 
+  // 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);
+
+    src+=offset*irowstride;
+    dest+=offset*orowstride;
+    end=src+dheight*irowstride;
+  }
+
   for (;src<end;src+=irowstride) {
     col=colrd=!colrd;
     if (!col) pc=0; // red
@@ -98,7 +108,7 @@
 
     weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,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("tvpic","salsaman",1,0,NULL,&tvpic_process,NULL,in_chantmpls,out_chantmpls,NULL,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("tvpic","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&tvpic_process,NULL,in_chantmpls,out_chantmpls,NULL,NULL);
 
     weed_plugin_info_add_filter_class (plugin_info,filter_class);

LiVES-1.4.2.tar.bz2/po/ar.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-11-21 13:17+0000\n"
 "Last-Translator: Muhammad Negm <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-02-17 22:24+0000\n"
 "X-Generator: Launchpad (build 12395)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +42,7 @@
 "group_id=64341&atid=507139\n"
 "سيتم إنعاش البرنامج بعد إعادة تشغيله. وشكرا\n"
 
-#: src/main.c:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
@@ -54,7 +54,7 @@
 "عند الإبلاغ عن العثرات ، يرجى ذِكر نظام التشغيل الخاص بك ، والتوزيعة ، "
 "وإصدارة البرنامج."
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "وأية معلومات موضحة أدناه.\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "الحفاظ على ضبط\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "غيّر حجم"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "غيّر حجم جميع الإطارات"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "أيّ"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "بدون"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "مستحسن"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "معطّل !"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**التخطيط الحالي**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "تحميل إضافات مؤثرات الوقت الحقيقي..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "بدء خادوم جاك الصوت..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr "بدء خادوم نقل جاك"
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr "يتصل بخادوم نقل جاك"
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "بدء خادوم بالص-اوديو..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "التحقق من إكتشاف التبعيات"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "تم العثور علي mplayer"
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "لم يتم العثور علي mplayer"
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "تم العثور علي convert"
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "لم يتم العثور علي convert"
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "تم العثور علي composite"
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "لم يتم العثور علي composite"
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "تم العثور على .'sox'\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "لم يتم العثور على .'sox'\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "إكتشاف...'cdda2wav'..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "عدم إكتشاف...'cdda2wav'..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "إكتشاف ...جاك..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "عدم إكتشاف ...جاك..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/po/ca.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-02-24 17:26+0000\n"
 "Last-Translator: Guybrush88 <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2010-02-27 11:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "Tot seguit hi haurà alguna informació:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,57 +72,57 @@
 "informació.\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Grup de seguretat.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Redimensionat"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "reconfigureu totes les finestres"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "qualsevol"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Cap"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "Recomanat"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "Espatllat"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**El disseny actual**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Carregant connexió d'efectes reals"
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Començant connexió de servidor d'audio jack..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 #, fuzzy
 msgid "Starting jack transport server..."
 msgstr "Començant connexió de servidor d'audio jack..."
 
-#: src/main.c:1230
+#: src/main.c:1248
 #, fuzzy
 msgid "Connecting to jack transport server..."
 msgstr "Començant connexió de servidor d'audio jack..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -133,95 +133,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Començant servidor d'audio pulsant..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Comprovant dependències opcionals:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...detectat..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NO S'HA DETECTAT..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "detectat convertidor"
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "NO S'HA DETECTAT convertidor"
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "detectada composició"
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "NO S'HA DETECTAT composició"
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...detectat...\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NO S'HA DETECTAT...\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NO S'HA DETECTAT..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NO S'HA DETECTAT..."
 
-#: src/main.c:1355

LiVES-1.4.2.tar.bz2/po/cs.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-01-17 09:42+0000\n"
 "Last-Translator: Guybrush88 <Unknown>\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:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -64,64 +64,64 @@
 "oraz wszelkie informacje przedstawione poniżej:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Zachování nastavení.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Měním velikost"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "Změnit velikost všech _snímků"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Libovolný"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Žádný"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "doporučeno"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "zakázáno!"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**Bieżący układ**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Načítám pluginy pro efekty v reálném času..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Spouštím zvukový server JACK..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 #, fuzzy
 msgid "Starting jack transport server..."
 msgstr "Spouštím zvukový server JACK..."
 
-#: src/main.c:1230
+#: src/main.c:1248
 #, fuzzy
 msgid "Connecting to jack transport server..."
 msgstr "Spouštím zvukový server JACK..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 #, fuzzy
 msgid ""
 "\n"
@@ -141,95 +141,95 @@
 "Případně můžete spustit LiVES příkazem: lives -aplayer sox\n"
 "\n"
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Kontrola dodatečných závislostí:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer... nalezen..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NENALEZEN..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert... nalezen..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert... NENALEZEN..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite... nalezen..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite... NENALEZEN..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox... nalezen\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox... NENALEZEN\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav... nalezen..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav... NENALEZEN..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd... nalezen..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd... NENALEZEN..."
 
-#: src/main.c:1355
+#: src/main.c:1375

LiVES-1.4.2.tar.bz2/po/da.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-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: 2010-05-06 12:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -37,7 +37,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
@@ -45,68 +45,68 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:134
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Ændrer størrelse"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr ""
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Enhver"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Ingen"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "anbefalet"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr ""
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr ""
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -117,95 +117,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1356

LiVES-1.4.2.tar.bz2/po/de_DE.po -> LiVES-1.4.3.tar.bz2/po/de_DE.po Changed

@@ -3,20 +3,20 @@
 "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-03-26 21:52-0300\n"
-"PO-Revision-Date: 2010-03-12 20:59+0000\n"
-"Last-Translator: Guybrush88 <Unknown>\n"
+"POT-Creation-Date: 2011-06-11 19:29-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"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-21 18:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-06-11 20:28+0000\n"
+"X-Generator: Launchpad (build 13175)\n"
 "X-Poedit-Country: GERMANY\n"
 "X-Poedit-Language: German\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -59,7 +59,7 @@
 "und alle folgenden Informationen angezeigt:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -69,57 +69,55 @@
 "weitere Informationen zu sammeln.\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Haltbare Menge.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Skalieren"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_Skaliere alle Frames"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Jede/s"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Keine/n"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "Empfohlen"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "deaktiviert !"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**Das aktuelle Layout**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Lade Echtzeiteffektplugins..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Starte den Jack Audio Server..."
 
-#: src/main.c:1229
-#, fuzzy
+#: src/main.c:1247
 msgid "Starting jack transport server..."
-msgstr "Starte den Jack Audio Server..."
+msgstr ""
 
-#: src/main.c:1230
-#, fuzzy
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
-msgstr "Starte den Jack Audio Server..."
+msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -130,95 +128,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Starte PulseAudio Server"
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Optionelle Abhängigkeiten werden überprüft:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer ...gefunden"
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...nicht gefunden..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...gefunden..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...nicht gefunden..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...gefunden..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...nicht gefunden..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "SoX...gefunden\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "SoX...nicht gefunden\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...gefunden..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...nicht gefunden..."

LiVES-1.4.2.tar.bz2/po/en_GB.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-02-22 15:36+0000\n"
 "Last-Translator: Robert Readman <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2010-03-21 18:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "and any information shown below:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,57 +72,57 @@
 "information.\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Preserving set.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Resizing"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_Resize All Frames"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Any"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "None"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "recommended"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "disabled !"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**The current layout**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Loading realtime effect plugins..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Starting jack audio server..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 #, fuzzy
 msgid "Starting jack transport server..."
 msgstr "Starting jack audio server..."
 
-#: src/main.c:1230
+#: src/main.c:1248
 #, fuzzy
 msgid "Connecting to jack transport server..."
 msgstr "Starting jack audio server..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 #, fuzzy
 msgid ""
 "\n"
@@ -141,95 +141,95 @@
 "\n"
 "Alternatively, try to start lives with: \"lives -aplayer sox\""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Starting pulse audio server..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Checking optional dependencies:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...detected..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NOT DETECTED..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...detected..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NOT DETECTED..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...detected..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NOT DETECTED..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...detected\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NOT DETECTED\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detected..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NOT DETECTED..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...detected..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NOT DETECTED..."
 
-#: src/main.c:1355

LiVES-1.4.2.tar.bz2/po/es.po -> LiVES-1.4.3.tar.bz2/po/es.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2011-02-06 10:34+0000\n"
 "Last-Translator: Paco Molinero <paco@byasl.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-02-17 22:26+0000\n"
 "X-Generator: Launchpad (build 12395)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +42,7 @@
 "group_id=64341&atid=507139\n"
 "Gracias, Podrás recuperar tu sesión si reinicias LiVES\n"
 
-#: src/main.c:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
@@ -54,7 +54,7 @@
 "Cuando reportes errores, por favor incluye detalles de tu sistema operativo, "
 "distribución, y la versión de LiVES("
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "y cualquier información relacionada\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,55 +72,55 @@
 "recolectar información.\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Conjunto preservado.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_Redimensionar todos los cuadros"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Cualquiera"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Ninguno"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "recomendado"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "¡desactivado!"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**La disposición actual**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Cargando plugins de effectos en tiempo real..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Iniciando el servidor de audio jack"
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Iniciando servidor pulse audio"
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Revisando dependencias opcionales:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer... detectado..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NO DETECTADO..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert... Detectado..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert... No Detectado"
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite... detectado..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite... No Detectado"
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox... detectado\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox... No Detectado\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav... detectado"
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav... NO DETECTADO..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd... detectado..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd... NO DETECTADO..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/po/et.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-09-12 13:23+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: 2010-09-13 13:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
@@ -54,7 +54,7 @@
 "Vigadest teatades, palun lisage infot oma operatsioonisüsteemist, jaotusest "
 "ja LiVES-i versioonist ("
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "ja mis tahes allpool esitatud teave:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Valiku säilitamine.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Mõõtmete muutmine"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_kõikide kaadrite suuruse muutmine"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Kõik"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Pole"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "soovitatav"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "keelatud !"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**Praegune skeem**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Laen reaalaja efektide pluginaid..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Heli serveri jack käivitamine..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Heli serveri pulse käivitamine..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...tuvastatud..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...ei tuvastatud..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "konverdi...tuvastatud..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "konversioon...ei tuvastatud..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "komposiit...tuvastatud.."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "komposiit...ei tuvastatud..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...tuvastatud\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...ei tuvastatud\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/po/fi.po -> LiVES-1.4.3.tar.bz2/po/fi.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-08-25 20:43+0000\n"
 "Last-Translator: Jussi Aalto <jta_l10n@dnainternet.net>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2010-09-08 00:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
@@ -60,7 +60,7 @@
 "Raportoidessasi kaatumisista, sisällytä käyttöjärjestelmän tiedot, "
 "jakeluversio ja LiVESin versiotiedot ("
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -68,7 +68,7 @@
 "ja alla olevat tiedot:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Säilytetään leikesarja.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Koon muutos"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "Muuta kaikkien kuvien k_okoa"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Mikä tahansa"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Ei mitään"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "suositeltu"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "kytketty pois päältä!"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**Nykyinen asettelu**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Ladataan reaaliaikaiset tehosteliitännäiset..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Käynnistetään jack-äänipalvelin..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr "Käynnistetään jack-välityspalvelin..."
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr "Yhdistetään jack-välityspalvelimeen..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -137,95 +137,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Käynnistetään pulse audio -palvelin..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Tarkistetaan valinnaiset riippuvuudet:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...havaittu..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...EI HAVAITTU..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...havaittu..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...EI HAVAITTU..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...havaittu..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...EI HAVAITTU..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...havaittu\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...EI HAVAITTU\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...havaittu..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...EI HAVAITTU..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...havaittu..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...EI HAVAITTU..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/po/fr.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-11-08 14:42+0000\n"
 "Last-Translator: Nicolas Delvaux <Unknown>\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:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 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:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Marque positionnée.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Recadrage"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_Recadre Toutes Les Images"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Tous"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Aucun"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "recommandé"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "désactivé !"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**La configuration actuelle**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Chargement des plugins d'effets en temps réel"
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Démarrage du serveur audio jack..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr "Lancement du serveur de transport Jack..."
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr "Connexion au serveur de transport Jack..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -136,95 +136,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Initialisation du serveur audio pulse..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Verification des dépendances optionnelles:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer....détecté..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON DÉTECTÉ..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...détecté..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON DÉTECTÉ..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...détecté..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON DÉTECTÉ..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...détecté\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON DÉTECTÉ\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...détecté..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NON DÉTECTÉ..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...détecté..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON DÉTECTÉ..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/po/gl.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-02-20 19:59+0000\n"
 "Last-Translator: Guybrush88 <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2010-02-21 12:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 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:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Preservar set.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_Redimensionar todos os cadros"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Calquer"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Ningún"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "recomendado"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "minusválidos !"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "** O esquema actual **"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Comprobar dependencias opcionais:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...detectados..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON DETECTA..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...detectados..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON DETECTA..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...detectados..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON DETECTA..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...detectados\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON DETECTA\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectados..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NON DETECTA..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...detectados..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON DETECTA..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/po/he.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-06-30 09:14+0000\n"
 "Last-Translator: Liel Fridman <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2010-07-04 22:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -47,7 +47,7 @@
 "group_id=64341&atid=507139\n"
 "תודה. ניתן לשחזר את הנתונים שאבדו בהפעלה מחדש של LiVES.\n"
 
-#: src/main.c:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
@@ -59,7 +59,7 @@
 "בעת דיווח על קריסות, נא לכלול פרטים על מערכת ההפעלה שלך, ההפצה וגרסת ה־LiVES "
 "שבשימוש ("
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,7 +67,7 @@
 "וכל מידע זמין מוצג כאן:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "מתבצע שימור האוסף.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "שינוי גודל"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_שינוי גודל כל השקופיות"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "הכל"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "ללא"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "מומלץ"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "נוטרל !"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**הפריסה הנוכחית**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "מתבצעת טעינת תוספים לאפקטים בזמן אמת..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "מתבצעת הפעלת שרת השמע jack..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr "מפעיל את שרת התעבורה של jack..."
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr "מתחבר לשרת התעבורה של jack..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 #, fuzzy
 msgid ""
 "\n"
@@ -145,95 +145,95 @@
 "לחילופין,יש לנסות להתחיל את LiVES כך: lives -aplayer sox\n"
 "\n"
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "מפעיל את שרת השמע Pulse..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "מתבצעת בדיקת חבילות תלות אפשריות:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...זוהה..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...לא זוהה..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...זוהה..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...לא זוהה..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...זוהה..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...לא זוהה..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...זוהה...\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...לא זוהה...\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...זוהה"
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...לא זוהה"
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...זוהה..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...לא זוהה..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/po/hr.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-10-26 14:50+0000\n"
 "Last-Translator: Guybrush88 <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-02-17 22:25+0000\n"
 "X-Generator: Launchpad (build 12395)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "i sve podatke prikazane u nastavku:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Očuvanje set.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Promjena veličine"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr ""
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Bilo koji"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Nijedan"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "preporučeno"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "isključeno !"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**Trenutni izgled**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Učitavanje stvarnom efekt čep..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Pokrećem jack audio poslužitelj..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr "Pokrećem jack transport server..."
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr "Spajanje na jack transport server..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Pokrećem pulse audio poslužitelj..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Provjera izborno ovisnosti:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...pronađen..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIJE PRONAĐEN..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...pronađen..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NIJE PRONAĐEN..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...otkriti..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NIJE OTKRIVENA..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...pronađen\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NIJE PRONAĐEN...\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...pronađen..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NIJE PRONAĐEN..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...pronađen..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NIJE PRONAĐEN..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/po/hu.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2011-03-15 13:51+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-03-19 16:36+0000\n"
 "X-Generator: Launchpad (build 12617)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "és minden lent szereplő információt:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Tartós beállítás.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Átméretezés"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_Minden képkocka átméretezése"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Bármely"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Nincs"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "ajánlott"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "tíltva!"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**A jelenlegi kimenet**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Az azonnali effektek betöltése..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Jack audió szerver indítása"
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Pulse audio szerver indítása..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Ajánlott függőségek ellenőrzése"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...megtalálva"
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NEM TALÁLOM.."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...megtalálva"
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NEM TALÁLOM"
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...megtalálva..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NEM TALÁLOM"
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...megtalálva\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NEM TALÁLOM\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...megtalálva..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NEM TALÁLOM..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...megtalálva..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NEM TALÁLOM..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/po/it.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-10-14 12:45+0000\n"
 "Last-Translator: LoReNicolò <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-02-17 22:26+0000\n"
 "X-Generator: Launchpad (build 12395)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "e qualsiasi altra informazione mostrata qua sotto:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Preservazione del set in corso.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Ridimensionamento"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_Ridimensiona Tutti I Fotogrammi"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Qualsiasi"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Nessuno"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "consigliato"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "disabilitato !"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**Il layout corrente**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Caricamento dei plugin degli effetti in tempo reale in corso..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Avvio del server audio jack in corso..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Avviando il server audio pulse..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Controllo delle dipendenze opzionali in corso:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...rilevato..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON RILEVATO..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...rilevato..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON RILEVATO..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...rilevato..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON RILEVATO..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...rilevato...\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON RILEVATO...\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...rilevato..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NON RILEVATO..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...rilevato..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON RILEVATO..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/po/ja.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
-"PO-Revision-Date: 2010-11-28 15:10+0000\n"
-"Last-Translator: Hiroshi Tagawa <Unknown>\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
+"PO-Revision-Date: 2011-03-29 23:39+0000\n"
+"Last-Translator: Shushi Kurose <md81bird@hitaki.net>\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-02-17 22:26+0000\n"
-"X-Generator: Launchpad (build 12395)\n"
+"X-Launchpad-Export-Date: 2011-06-11 20:28+0000\n"
+"X-Generator: Launchpad (build 13175)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -36,77 +36,88 @@
 "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:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
 "When reporting crashes, please include details of your operating system, "
 "distribution, and the LiVES version ("
 msgstr ""
+"\n"
+"\n"
+"クラッシュ報告する際は、使用しているOS・ディストリビューションやLiVESのバー"
+"ジョンなどの詳細も含めてください ("
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
+"また、以下の情報もお願いします:\n"
+"\n"
 
-#: src/main.c:126
+#: src/main.c:134
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "セットの保護\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "リサイズ"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "全フレームのリサイズ(_R)"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "任意"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "なし"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "推奨"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "使用不能"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**現在のレイアウト**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
-msgstr "リアルタイム・エフェクトプラグインをロード..."
+msgstr "リアルタイム・エフェクトプラグインをロード中..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
-msgstr "jack音声サーバを開始..."
+msgstr "JACKサーバの音声機能を開始しています..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
-msgstr ""
+msgstr "JACKサーバのトランスポート機能を開始しています..."
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
-msgstr ""
+msgstr "JACKサーバのトランスポート機能に接続しています..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -117,95 +128,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
-msgstr ""
+msgstr "PulseAudioサーバを開始しています..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
-msgstr "オプションの依存性をチェック:"
+msgstr "必須ではない依存性を確認しています:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
-msgstr "mplayer...検出..."
+msgstr "mplayerが見つかりました..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
-msgstr "mplayer...未検出..."
+msgstr "mplayerは見つかりませんでした..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
-msgstr "convert...検出..."
+msgstr "convertが見つかりました..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
-msgstr "convert...未検出..."
+msgstr "convertは見つかりませんでした..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
-msgstr "composite...検出..."
+msgstr "compositeが見つかりました..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
-msgstr "composite...未検出..."
+msgstr "compositeは見つかりませんでした..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
-msgstr "sox...検出\n"
+msgstr "soxが見つかりました\n"

LiVES-1.4.2.tar.bz2/po/lives.pot -> LiVES-1.4.3.tar.bz2/po/lives.pot Changed

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lives 1.4.2\n"
+"Project-Id-Version: lives 1.4.3\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-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:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -36,7 +36,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
@@ -44,68 +44,68 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:134
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr ""
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr ""
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr ""
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr ""
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr ""
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr ""
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr ""
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -116,95 +116,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1355
+#: src/main.c:1375

LiVES-1.4.2.tar.bz2/po/nl_NL.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-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:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -34,7 +34,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
@@ -42,70 +42,70 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:134
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Grootte aanpassen"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr ""
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Welke dan ook"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Geen"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "aanbevolen"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "uitgeschakeld"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr ""
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Jack audio server starten ..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 #, fuzzy
 msgid "Starting jack transport server..."
 msgstr "Jack audio server starten ..."
 
-#: src/main.c:1230
+#: src/main.c:1248
 #, fuzzy
 msgid "Connecting to jack transport server..."
 msgstr "Jack audio server starten ..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -116,95 +116,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Optionele afhankelijkheden aan het controleren:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...gevonden..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIET GEDETECTEERD..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...gedetecteerd..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NIET GEDETECTEERD..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...gedetecteerd..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NIET GEDETECTEERD..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...gedetecteerd\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NIET GEDECTEERD\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...gedetecteerd..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NIET GEDETECTEERD..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."
 msgstr ""

LiVES-1.4.2.tar.bz2/po/oc.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-04-23 13:24+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: 2010-05-06 12:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -37,7 +37,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
@@ -45,68 +45,68 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:134
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Marca posicionada.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Redimensionament"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr ""
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Quin que siá"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Pas cap"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "recomandat"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "desactivat !"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**La configuracion actuala**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Cargament dels plugins d'efièches en temps real"
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Aviada del servidor àudio jack..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -117,95 +117,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Initializacion del servidor àudio pulse..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Verificacion de las dependéncias opcionalas :"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer....detectat..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...PAS DETECTAT..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...detectat..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...PAS DETECTAT..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...detectat..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...PAS DETECTAT..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...detectat\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...PAS DETECTAT\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...PAS DETECTAT..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...PAS DETECTAT..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectat..."
 
-#: src/main.c:1356

LiVES-1.4.2.tar.bz2/po/pl.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-05-14 21:38+0000\n"
 "Last-Translator: Marek Jędrzejewski <slomianowlosy@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2010-07-04 22:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +62,7 @@
 "oraz wszelkie informacje przedstawione poniżej:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Skalowanie"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_Skaluj Wszystkie Klatki"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Dowolny"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Żaden"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "zalecane"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "niepełnosprawnych !"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**Obecny układ**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -131,95 +131,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Uruchamianie serwera pulse audio"
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Sprawdzanie zależności opcjonalne:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...  wykryto..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIE WYKRYTO..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...wykrytych..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NIE WYKRYTO..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...wykrytych..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NIE WYKRYTO..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...wykrytych\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NIE WYKRYTO\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...wykrytych..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NIE WYKRYTO..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...wykrytych..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NIE WYKRYTO..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/po/pt.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-03-20 20:52+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:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -59,64 +59,64 @@
 "e todas as informações mostradas abaixo:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Preservando set.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "A redimensionar"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_Redimensionar Todos Frames"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Qualquer"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Nenhum"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "recomendado"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "desactivado!"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**O layout atual**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "A carregar plugins de efeito em tempo real..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "A iniciar servidor de jack audio..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 #, fuzzy
 msgid "Starting jack transport server..."
 msgstr "A iniciar servidor de jack audio..."
 
-#: src/main.c:1230
+#: src/main.c:1248
 #, fuzzy
 msgid "Connecting to jack transport server..."
 msgstr "A iniciar servidor de jack audio..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 #, fuzzy
 msgid ""
 "\n"
@@ -137,95 +137,95 @@
 "Ou tente inciar o lives com: -aplayer sox\n"
 "\n"
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "A verificar as dependências opcionais:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...detectado..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NÃO DETECTADO..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...detectado..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NÃO DETECTADO..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...detectado\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NÃO DETECTADO...\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectado..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NÃO DETECTADO..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...detectado..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NÃO DETECTADO..."
 
-#: src/main.c:1355
+#: src/main.c:1375

LiVES-1.4.2.tar.bz2/po/pt_BR.po -> LiVES-1.4.3.tar.bz2/po/pt_BR.po Changed

@@ -3,20 +3,20 @@
 "Project-Id-Version: LiVES\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2011-03-26 21:52-0300\n"
-"PO-Revision-Date: 2010-10-24 23:39+0000\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
+"PO-Revision-Date: 2011-04-30 07:07+0000\n"
 "Last-Translator: Gustavo Guidorizzi <Unknown>\n"
 "Language-Team: pixel <vjpixel@gmail.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-17 22:24+0000\n"
-"X-Generator: Launchpad (build 12395)\n"
+"X-Launchpad-Export-Date: 2011-06-11 20:28+0000\n"
+"X-Generator: Launchpad (build 13175)\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -59,7 +59,7 @@
 "e toda informação mostrada abaixo:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Preservando set.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_Redimensionar Todos Frames"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Qualquer"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Nenhum"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "recomendado"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "desativado!"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**Layout atual**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Carregando plugins de efeitos em tempo real..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Iniciando servidor de áudio jack..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr "Iniciando o servidor jack de transporte..."
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr "Conectando ao servidor jack de transporte..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -128,95 +128,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Iniciando o servidor pulse audio..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Checando dependências opcionais:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...detectado..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NÃO DETECTADO..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...detectado..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NÃO DETECTADO..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...detectado\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NÃO DETECTADO...\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectado..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NÃO DETECTADO..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...detectado..."

LiVES-1.4.2.tar.bz2/po/ro.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-02-21 11:00+0000\n"
 "Last-Translator: Guybrush88 <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2010-02-21 12:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 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:126
+#: src/main.c:134
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -73,57 +73,57 @@
 "multe informații.\n"
 "\n"
 
-#: src/main.c:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Păstrarea set.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Redimensionare"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_Redimensionarea tuturor cadrelor"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Orice"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Nimic"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "recomandat"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "dezactivat !"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "** Structura actuală **"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Se incarcă modulele de efecte in timp real..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Pornirea serverului audio jack..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 #, fuzzy
 msgid "Starting jack transport server..."
 msgstr "Pornirea serverului audio jack..."
 
-#: src/main.c:1230
+#: src/main.c:1248
 #, fuzzy
 msgid "Connecting to jack transport server..."
 msgstr "Pornirea serverului audio jack..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 #, fuzzy
 msgid ""
 "\n"
@@ -142,95 +142,95 @@
 "\n"
 "Alternativ, incercati pornirea lives cu: \"lives -aplayer sox\""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Pornirea serverului audio pulse..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Verificarea dependenţelor opţionale:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...a fost detectat..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... nu a fost detectat..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...detectat..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NU A FOST DETECTAT..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...detectat..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NU A FOST DETECTAT..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...detectat\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NU A FOST DETECTAT\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NU A FOST DETECTAT..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NU A FOST DETECTAT..."
 
-#: src/main.c:1355

LiVES-1.4.2.tar.bz2/po/ru.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-12-06 00:51+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-02-17 22:26+0000\n"
 "X-Generator: Launchpad (build 12395)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -47,7 +47,7 @@
 "tracker/?group_id=64341&atid=507139\n"
 "Спасибо. Для восстановления перезапустите LiVES.\n"
 
-#: src/main.c:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
@@ -59,7 +59,7 @@
 "В отчете об ошибке, пожалуйста, сообщите о вашей операционной системе, "
 "дистрибутиве, а также версию LiVES ("
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,7 +67,7 @@
 "и другую информацию, как указано ниже:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Сохранение сборки.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Масштабирование"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_Масштабировать все кадры"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Любой"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Нет"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "рекомендуемые"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "отключено!"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "Текущее размещение"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Загрузка плагина эффектов реального времени..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Запуск звукового сервера jack..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr "Запуск передающего сервера jack..."
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr "Подключение к передающему jack-серверу..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -136,95 +136,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Запуск сервера pulse audio..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Проверка опциональных зависимостей:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...обнаружен..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...обнаружен..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...обнаружен..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...обнаружен...\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...НЕ ОБНАРУЖЕН...\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...обнаружен..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...обнаружен..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/po/sk.po -> LiVES-1.4.3.tar.bz2/po/sk.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-03-28 17:11+0000\n"
 "Last-Translator: milboy <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2010-05-06 12:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 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:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Nastavenie zachovania.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Zmeniť veľkosť"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_Zmeniť veľkosť všetkých snímkov"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Ktorýkoľvek"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Žiaden"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "doporučené"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "zakázané !"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**Súčasné rozloženie**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Načítavam efekt rozšírenia v réálnom čase..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Spúšťam zvukový server jack..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 #, fuzzy
 msgid ""
 "\n"
@@ -145,95 +145,95 @@
 "Prípadne môžete spustit LiVES príkazom: lives -aplayer sox\n"
 "\n"
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Spúšťam pulse audio server..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Kontrola dodatočných záavislostí:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...nájdený..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NENÁJDENÝ..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...nájdený..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NENÁJDENÝ..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...nájdený..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NENÁJDENÝ..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...nájdený\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NENÁJDENÝ\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...nájdený..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NENÁJDENÝ..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...nájdený..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NENÁJDENÝ..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/po/te.po -> LiVES-1.4.3.tar.bz2/po/te.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2009-12-27 23:30+0000\n"
 "Last-Translator: Guybrush88 <Unknown>\n"
 "Language-Team: Telugu <te@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2010-02-21 13:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -37,7 +37,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
@@ -45,68 +45,68 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:134
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr ""
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr ""
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "ఏదైనా"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "ఏదీ వద్దు"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr ""
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr ""
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr ""
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -117,95 +117,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1356

LiVES-1.4.2.tar.bz2/po/tr.po -> LiVES-1.4.3.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-11-09 20:35+0000\n"
 "Last-Translator: zeugma <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-02-17 22:27+0000\n"
 "X-Generator: Launchpad (build 12395)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 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:119
+#: src/main.c:127
 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:122
+#: src/main.c:130
 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:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Koruma ayarları.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Yeniden boyutlandırma"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "Tüm çerçeveleri yeniden boyutlandır"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Herhangi"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Boş"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "tavsiye"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "Engelli!"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**Mevcut yerleşim düzeni**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Gerçek zaman efekt eklentileri yükleniyor"
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Jack audio sunucusu başlıyor..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr "Jack taşıma sunucusu başlıyor"
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr "Jack taşıma sunucusuna bağlanılıyor"
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -132,95 +132,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Pulse audio sunucusu başlıyor"
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Isteğe bağlı bağımlılıkları denetleme:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer ... bulundu ..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer ... BULUNAMADI ..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...bulundu..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...BULUNAMADI..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite ... bulundu ..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite ... BULUNAMADI ..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...bulundu\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...BULUNAMADI\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...bulundu..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...BULUNAMADI..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...bulundu..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...BULUNAMADI..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/po/uk.po -> LiVES-1.4.3.tar.bz2/po/uk.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-03-26 21:52-0300\n"
-"PO-Revision-Date: 2010-12-21 19:53+0000\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
+"PO-Revision-Date: 2011-06-06 16:02+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-02-17 22:27+0000\n"
-"X-Generator: Launchpad (build 12395)\n"
+"X-Launchpad-Export-Date: 2011-06-11 20:28+0000\n"
+"X-Generator: Launchpad (build 13175)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -47,7 +47,7 @@
 "group_id=64341&atid=507139\n"
 "Дякуємо. Відновити дані можна буде після перезапуску LiVES.\n"
 
-#: src/main.c:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
@@ -59,7 +59,7 @@
 "Будь ласка, у повідомленнях про помилки у програмі вказуйте назву вашої "
 "операційної системи, дистрибутива та номер версії LiVES ("
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,7 +67,7 @@
 "а також дані, наведені нижче:\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "Збереження набору.\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Зміна розміру"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "_Змінити розміри всіх кадрів"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Будь-який"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Жодного"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "найліпший"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "вимкнено!"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**Поточне компонування**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "Завантаження додатків ефектів реального часу…"
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "Запуск звукового сервера jack…"
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr "Запуск сервера передавання даних jack…"
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr "Встановлення з’єднання з сервером передавання даних jack…"
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -143,95 +143,95 @@
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "Запуск звукового сервера PulseAudio…"
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "Пошук додаткових залежностей:"
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer… виявлено…"
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert…виявлено…"
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite…виявлено…"
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox…виявлено\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox…НЕ ВИЯВЛЕНО\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...виявлено..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...НЕ ВИЯВЛЕНО..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd…виявлено…"
 
-#: src/main.c:1354
+#: src/main.c:1374

LiVES-1.4.2.tar.bz2/po/uz.po -> LiVES-1.4.3.tar.bz2/po/uz.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2010-02-21 10:20+0000\n"
 "Last-Translator: Guybrush88 <Unknown>\n"
 "Language-Team: Uzbek <uz@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2010-02-21 13:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -37,7 +37,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
@@ -45,68 +45,68 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:126
+#: src/main.c:134
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "Хажмимни узгартириш"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr ""
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "Исталган"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "Йўқ"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr ""
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr ""
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr ""
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -117,95 +117,95 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1356

LiVES-1.4.2.tar.bz2/po/zh_CN.po -> LiVES-1.4.3.tar.bz2/po/zh_CN.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-03-26 21:52-0300\n"
+"POT-Creation-Date: 2011-06-11 19:29-0300\n"
 "PO-Revision-Date: 2011-03-13 04:07+0000\n"
 "Last-Translator: 英华 <wantinghard@gmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -19,7 +19,7 @@
 "X-Launchpad-Export-Date: 2011-03-19 16:36+0000\n"
 "X-Generator: Launchpad (build 12617)\n"
 
-#: src/main.c:102
+#: src/main.c:110
 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:118
+#: src/main.c:126
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +42,7 @@
 "谢。\n"
 "重启 LiVES 之后应该可以恢复。\n"
 
-#: src/main.c:119
+#: src/main.c:127
 msgid ""
 "\n"
 "\n"
@@ -53,7 +53,7 @@
 "\n"
 "报告崩溃时请包括操作系统、发行版及 LiVES 版本信息 ("
 
-#: src/main.c:122
+#: src/main.c:130
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -61,7 +61,7 @@
 "以及下面的信息：\n"
 "\n"
 
-#: src/main.c:126
+#: src/main.c:134
 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:134
+#: src/main.c:142
 msgid "Preserving set.\n"
 msgstr "正在保存场景。\n"
 
-#: src/main.c:476
+#: src/main.c:488
 msgid "Resizing"
 msgstr "正在调整尺寸"
 
-#: src/main.c:483
+#: src/main.c:495
 msgid "_Resize All Frames"
 msgstr "调整所有帧的尺寸(_R)"
 
-#: src/main.c:744
+#: src/main.c:756
 msgid "Any"
 msgstr "任意"
 
-#: src/main.c:745
+#: src/main.c:757
 msgid "None"
 msgstr "无"
 
-#: src/main.c:746
+#: src/main.c:758
 msgid "recommended"
 msgstr "推荐"
 
-#: src/main.c:747
+#: src/main.c:759
 msgid "disabled !"
 msgstr "已禁用 ！"
 
-#: src/main.c:748
+#: src/main.c:760
 msgid "**The current layout**"
 msgstr "**当前的布局**"
 
-#: src/main.c:1174
+#: src/main.c:1192
 msgid "Loading realtime effect plugins..."
 msgstr "正在加载实时效果插件..."
 
-#: src/main.c:1227
+#: src/main.c:1245
 msgid "Starting jack audio server..."
 msgstr "正在启动 jack 音频服务器..."
 
-#: src/main.c:1229
+#: src/main.c:1247
 msgid "Starting jack transport server..."
 msgstr "正在启动 jack 传输服务器..."
 
-#: src/main.c:1230
+#: src/main.c:1248
 msgid "Connecting to jack transport server..."
 msgstr "正在连接 jack 传输服务器..."
 
-#: src/main.c:1257
+#: src/main.c:1275
 msgid ""
 "\n"
 "\n"
@@ -136,95 +136,95 @@
 "\n"
 "或者，尝试通过“lives -jackopts 16”或以下方式启动 lives "
 
-#: src/main.c:1281
+#: src/main.c:1299
 msgid "Starting pulse audio server..."
 msgstr "正在开启 pulse 音频服务..."
 
-#: src/main.c:1342
+#: src/main.c:1362
 msgid "Checking optional dependencies:"
 msgstr "检查可选的依赖："
 
-#: src/main.c:1343
+#: src/main.c:1363
 msgid "mplayer...detected..."
 msgstr "mplayer...发现..."
 
-#: src/main.c:1344
+#: src/main.c:1364
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...未发现..."
 
-#: src/main.c:1345
+#: src/main.c:1365
 msgid "convert...detected..."
 msgstr "convert...发现..."
 
-#: src/main.c:1346
+#: src/main.c:1366
 msgid "convert...NOT DETECTED..."
 msgstr "convert...未发现..."
 
-#: src/main.c:1347
+#: src/main.c:1367
 msgid "composite...detected..."
 msgstr "composite...发现..."
 
-#: src/main.c:1348
+#: src/main.c:1368
 msgid "composite...NOT DETECTED..."
 msgstr "composite...未发现..."
 
-#: src/main.c:1349
+#: src/main.c:1369
 msgid "sox...detected\n"
 msgstr "sox...发现\n"
 
-#: src/main.c:1350
+#: src/main.c:1370
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...未发现\n"
 
-#: src/main.c:1351
+#: src/main.c:1371
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...发现..."
 
-#: src/main.c:1352
+#: src/main.c:1372
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...未发现..."
 
-#: src/main.c:1353
+#: src/main.c:1373
 msgid "jackd...detected..."
 msgstr "jackd...发现..."
 
-#: src/main.c:1354
+#: src/main.c:1374
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...未发现..."
 
-#: src/main.c:1355
+#: src/main.c:1375
 msgid "pulse audio...detected..."

LiVES-1.4.2.tar.bz2/smogrify -> LiVES-1.4.3.tar.bz2/smogrify Changed

LiVES-1.4.2.tar.bz2/src/Makefile.am -> LiVES-1.4.3.tar.bz2/src/Makefile.am Changed

LiVES-1.4.2.tar.bz2/src/Makefile.in -> LiVES-1.4.3.tar.bz2/src/Makefile.in Changed

@@ -118,7 +118,8 @@
 lives_exe_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -401,6 +402,7 @@
 @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
+@HAVE_LIBv4l1_TRUE@v4l1_LDADD = -lv4l1
 lives_exe_SOURCES = \
 	main.c\
 	support.c support.h \
@@ -442,7 +444,7 @@
 	$(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) \
+	$(oil_LDADD) $(alsa_LDADD) $(pulse_LDADD) -lpthread $(libweed_LDADD) $(giw_LDADD) $(v4l1_LDADD) \
 	@UNICAP_LIBS@
 
 AM_CFLAGS = -Wstrict-aliasing=0 $(yuv4mpeg_CFLAGS) $(ldvgrab_CFLAGS) $(dvgrab_CFLAGS) $(oil_CFLAGS) \

LiVES-1.4.2.tar.bz2/src/audio.c -> LiVES-1.4.3.tar.bz2/src/audio.c Changed

@@ -4,6 +4,9 @@
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #include "main.h"
 #include "audio.h"
 #include "events.h"
@@ -59,7 +62,7 @@
 
 
 
-inline void sample_silence_dS (float *dst, unsigned long nsamples) {
+LIVES_INLINE void sample_silence_dS (float *dst, unsigned long nsamples) {
   memset(dst,0,nsamples*sizeof(float));
 }
 
@@ -2024,3 +2027,171 @@
 lives_audio_buf_t *audio_cache_get_buffer(void) {
   return cache_buffer;
 }
+
+
+
+////////////////////////////////////////
+// audio streaming
+
+static int astream_pid=0;
+
+gboolean start_audio_stream(void) {
+  const gchar *playername="audiostreamer.pl";
+  gchar *astream_name=NULL;
+  gchar *astream_name_out=NULL;
+
+  // playback plugin wants an audio stream - so fork and run the stream
+  // player
+  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;
+
+  astream_name=g_build_filename(prefs->tmpdir,astname,NULL);
+  mkfifo(astream_name,S_IRUSR|S_IWUSR);
+
+  astream_name_out=g_build_filename(prefs->tmpdir,astname_out,NULL);
+
+  g_free(astname);
+  g_free(astname_out);
+
+    if (prefs->audio_player==AUD_PLAYER_PULSE) {
+#ifdef HAVE_PULSE_AUDIO
+      arate=(int)mainw->pulsed->out_arate;
+      // TODO - chans, samps, signed, endian
+#endif
+    }
+
+    if (prefs->audio_player==AUD_PLAYER_JACK) {
+#ifdef ENABLE_JACK
+      arate=(int)mainw->jackd->sample_out_rate;
+      // TODO - chans, samps, signed, endian
+      
+#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
+    
+    setsid(); // create new session id
+    
+    // block here until killed
+
+    dummyvar=system(com);
+
+    _exit(0);                    
+  }
+
+  while (1) {
+    afd=open(astream_name,O_WRONLY|O_SYNC);
+    if (afd!=-1) break;
+    g_usleep(prefs->sleep_time);
+  }
+
+
+  if (prefs->audio_player==AUD_PLAYER_PULSE) {
+#ifdef HAVE_PULSE_AUDIO
+    mainw->pulsed->astream_fd=afd;
+#endif
+  }
+
+  if (prefs->audio_player==AUD_PLAYER_JACK) {
+#ifdef ENABLE_JACK
+    mainw->jackd->astream_fd=afd;
+#endif
+  }
+
+  g_free(astreamer);
+  g_free(com);
+  g_free(astream_name);
+  g_free(astream_name_out);
+
+  return TRUE;
+}
+
+
+
+void stop_audio_stream(void) {
+  if (astream_pid>0) {
+    // if we were streaming audio, kill it
+    const gchar *playername="audiostreamer.pl";
+    gchar *astname=g_strdup_printf("livesaudio-%d.pcm",getpid());
+    gchar *astname_out=g_strdup_printf("livesaudio-%d.stream",getpid());
+    gchar *astreamer=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_AUDIO_STREAM,playername,NULL);
+
+    gchar *astream_name=g_build_filename(prefs->tmpdir,astname,NULL);
+    gchar *astream_name_out=g_build_filename(prefs->tmpdir,astname_out,NULL);
+
+    gchar *com;
+
+    pid_t pgid=getpgid(astream_pid);
+
+    g_free(astname);
+    g_free(astname_out);
+
+    if (prefs->audio_player==AUD_PLAYER_PULSE) {
+#ifdef HAVE_PULSE_AUDIO
+      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);
+      mainw->jackd->astream_fd=-1;
+#endif
+    }
+
+    kill(-pgid,9);
+    unlink(astream_name);
+    g_free(astream_name);
+
+    // astreamer should remove cooked stream
+    com=g_strdup_printf("%s cleanup %d \"%s\"",astreamer,mainw->vpp->audio_codec,astream_name_out);
+    dummyvar=system(com);
+    g_free(astreamer);
+    g_free(com);
+    g_free(astream_name_out);
+
+  }
+
+
+}
+
+
+void clear_audio_stream(void) {
+  // remove raw and cooked streams
+  gchar *astname=g_strdup_printf("livesaudio-%d.pcm",getpid());
+  gchar *astream_name=g_build_filename(prefs->tmpdir,astname,NULL);
+  gchar *astname_out=g_strdup_printf("livesaudio-%d.stream",getpid());
+  gchar *astream_name_out=g_build_filename(prefs->tmpdir,astname_out,NULL);
+  unlink(astream_name);
+  unlink(astream_name_out);
+  g_free(astname);
+  g_free(astream_name);
+  g_free(astname_out);
+  g_free(astream_name_out);
+}
+
+
+
+LIVES_INLINE void audio_stream(void *buff, size_t nbytes, int fd) {
+  if (fd!=-1) {
+    dummyvar=write(fd,buff,nbytes);
+  }
+}
+
+
+
+

LiVES-1.4.2.tar.bz2/src/audio.h -> LiVES-1.4.3.tar.bz2/src/audio.h Changed

LiVES-1.4.2.tar.bz2/src/callbacks.c -> LiVES-1.4.3.tar.bz2/src/callbacks.c Changed

@@ -25,6 +25,7 @@
 #include "events.h"
 #include "audio.h"
 #include "cvirtual.h"
+#include "paramwindow.h"
 
 #ifdef HAVE_YUV4MPEG
 #include "lives-yuv4mpeg.h"
@@ -71,6 +72,7 @@
       gtk_timeout_remove (mainw->kb_timer);
       if (mainw->ext_playback) {
 	if (mainw->vpp->exit_screen!=NULL) (*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
+	stop_audio_stream();
 	mainw->stream_ticks=-1;
       }
       
@@ -404,6 +406,10 @@
   if (GTK_IS_ENTRY(tentry)) gtk_entry_set_text(GTK_ENTRY(tentry),(tmp=g_filename_to_utf8(text,-1,NULL,NULL,NULL)));
   else gtk_text_buffer_set_text (GTK_TEXT_BUFFER(tentry), (tmp=g_filename_to_utf8(text,-1,NULL,NULL,NULL)), -1);
 
+  // force update to be recognized
+  if (g_object_get_data(G_OBJECT(tentry),"rfx")!=NULL) 
+    after_param_text_changed(tentry,g_object_get_data(G_OBJECT(tentry),"rfx"));
+
   g_free(tmp);
   g_free(text);
 
@@ -3786,6 +3792,11 @@
   cliplist=mainw->cliplist;
 
   while (cliplist!=NULL) {
+
+    pthread_mutex_lock(&mainw->gtk_mutex);
+    while (g_main_context_iteration(NULL,FALSE));
+    pthread_mutex_unlock(&mainw->gtk_mutex);
+
     i=GPOINTER_TO_INT(cliplist->data);
     if (mainw->files[i]!=NULL&&(mainw->files[i]->clip_type==CLIP_TYPE_FILE||mainw->files[i]->clip_type==CLIP_TYPE_DISK)) {
       if ((tmp=strrchr(mainw->files[i]->handle,'/'))!=NULL) {
@@ -3984,12 +3995,17 @@
 
   while (1) {
 
+    pthread_mutex_lock(&mainw->gtk_mutex);
+    while (g_main_context_iteration(NULL,FALSE));
+
     if (mainw->cached_list!=NULL) {
       g_list_free_strings(mainw->cached_list);
       g_list_free(mainw->cached_list);
       mainw->cached_list=NULL;
     }
 
+    pthread_mutex_unlock(&mainw->gtk_mutex);
+
     if (orderfile==NULL) {
       // old style (pre 0.9.6)
       com=g_strdup_printf ("smogrify get_next_in_set %s %s %d",mainw->msg,mainw->set_name,getpid());
@@ -4661,7 +4677,7 @@
   // file selector preview
   gchar *com;
   unsigned int xwin=0;
-  gint preview_frames=200;
+  gint preview_frames=1000000000;
   gint preview_type=GPOINTER_TO_INT (user_data);
   gdouble start_time=0.;
   FILE *ifile=NULL;
@@ -4696,7 +4712,7 @@
     gchar **array;
     gchar *tmp;
  
-    preview_frames=500;
+    preview_frames=1000000000;
 
     clear_mainw_msg();

LiVES-1.4.2.tar.bz2/src/colourspace.c -> LiVES-1.4.3.tar.bz2/src/colourspace.c Changed

LiVES-1.4.2.tar.bz2/src/cvirtual.c -> LiVES-1.4.3.tar.bz2/src/cvirtual.c Changed

LiVES-1.4.2.tar.bz2/src/dialogs.c -> LiVES-1.4.3.tar.bz2/src/dialogs.c Changed

@@ -45,6 +45,8 @@
 // how often to we count frames when opening
 #define OPEN_CHECK_TICKS (U_SECL/10l)
 
+static volatile gboolean dlg_thread_ready=FALSE;
+
 void on_warn_mask_toggled (GtkToggleButton *togglebutton, gpointer user_data)
 {
   GtkWidget *tbutton;
@@ -486,28 +488,30 @@
 #endif
 
     
+    if (!mainw->ext_playback||(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)) {
     // get time from soundcard
 
+
 #ifdef ENABLE_JACK
-    if (time_source==LIVES_TIME_SOURCE_NONE&&!mainw->foreign&&prefs->audio_player==AUD_PLAYER_JACK&&cfile->achans>0&&(!mainw->is_rendering||(mainw->multitrack!=NULL&&!cfile->opening&&!mainw->multitrack->is_rendering))&&mainw->jackd!=NULL&&mainw->jackd->in_use) {
-      if (!(mainw->fixed_fpsd>0.||(mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback))) {
-	if (mainw->aud_rec_fd!=-1) mainw->currticks=lives_jack_get_time(mainw->jackd_read,TRUE);
-	else mainw->currticks=lives_jack_get_time(mainw->jackd,TRUE);
-	time_source=LIVES_TIME_SOURCE_SOUNDCARD;
+      if (time_source==LIVES_TIME_SOURCE_NONE&&!mainw->foreign&&prefs->audio_player==AUD_PLAYER_JACK&&cfile->achans>0&&(!mainw->is_rendering||(mainw->multitrack!=NULL&&!cfile->opening&&!mainw->multitrack->is_rendering))&&mainw->jackd!=NULL&&mainw->jackd->in_use) {
+	if (!(mainw->fixed_fpsd>0.||(mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback))) {
+	  if (mainw->aud_rec_fd!=-1) mainw->currticks=lives_jack_get_time(mainw->jackd_read,TRUE);
+	  else mainw->currticks=lives_jack_get_time(mainw->jackd,TRUE);
+	  time_source=LIVES_TIME_SOURCE_SOUNDCARD;
+	}
       }
-    }
 #endif
 
 #ifdef HAVE_PULSE_AUDIO
-    if (time_source==LIVES_TIME_SOURCE_NONE&&!mainw->foreign&&prefs->audio_player==AUD_PLAYER_PULSE&&cfile->achans>0&&(!mainw->is_rendering||(mainw->multitrack!=NULL&&!cfile->opening&&!mainw->multitrack->is_rendering))&&((mainw->pulsed!=NULL&&mainw->pulsed->in_use)||mainw->pulsed_read!=NULL)) {
-      if (!(mainw->fixed_fpsd>0.||(mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback))) {
-	if (mainw->aud_rec_fd!=-1) mainw->currticks=lives_pulse_get_time(mainw->pulsed_read,TRUE);
-	else mainw->currticks=lives_pulse_get_time(mainw->pulsed,TRUE);
-	time_source=LIVES_TIME_SOURCE_SOUNDCARD;
+      if (time_source==LIVES_TIME_SOURCE_NONE&&!mainw->foreign&&prefs->audio_player==AUD_PLAYER_PULSE&&cfile->achans>0&&(!mainw->is_rendering||(mainw->multitrack!=NULL&&!cfile->opening&&!mainw->multitrack->is_rendering))&&((mainw->pulsed!=NULL&&mainw->pulsed->in_use)||mainw->pulsed_read!=NULL)) {
+	if (!(mainw->fixed_fpsd>0.||(mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback))) {
+	  if (mainw->aud_rec_fd!=-1) mainw->currticks=lives_pulse_get_time(mainw->pulsed_read,TRUE);
+	  else mainw->currticks=lives_pulse_get_time(mainw->pulsed,TRUE);
+	  time_source=LIVES_TIME_SOURCE_SOUNDCARD;
+	}
       }
-    }
 #endif
-
+    }
     if (time_source==LIVES_TIME_SOURCE_NONE) {
       // get time from system clock
       gettimeofday(&tv, NULL);
@@ -1755,6 +1759,7 @@
 
   if (!pthread_islocked) {
     g_free(procw);
+    dlg_thread_ready=TRUE;
     return; // parent process finished already
   }
 
@@ -1858,6 +1863,7 @@
   if (!pthread_islocked) {
     gtk_widget_destroy(procw->processing);
     g_free(procw);
+    dlg_thread_ready=TRUE;
     return;
   }
 
@@ -1865,7 +1871,8 @@
   gtk_window_set_position (GTK_WINDOW (procw->processing), GTK_WIN_POS_CENTER);
 
   gtk_widget_queue_draw(procw->processing);
-  gdk_flush ();
+
+  //gdk_flush ();
 
   lives_set_cursor_style(LIVES_CURSOR_BUSY,procw->processing->window);
 
@@ -1873,6 +1880,7 @@
   gettimeofday(&tv, NULL);
   sttime=tv.tv_sec*1000000+tv.tv_usec;
 
+  dlg_thread_ready=TRUE;
 
   while (mainw->threaded_dialog&&mainw->cancelled!=CANCEL_USER&&mainw->cancelled!=CANCEL_KEEP&&pthread_islocked) {
     // mutex locked
@@ -1888,7 +1896,8 @@
     }
 
     gtk_widget_queue_draw(procw->processing);
-    gdk_flush ();
+
+    //gdk_flush ();
 
     // unlock mutex
     pthread_mutex_unlock(&mainw->gtk_mutex);
@@ -1904,7 +1913,7 @@
   }
 
   gtk_widget_destroy(procw->processing);
-  gdk_flush ();
+  //gdk_flush ();
 
   g_free(procw);
 
@@ -1980,9 +1989,20 @@
   thread_text=g_strdup(text);
   mainw->threaded_dialog=TRUE;
   clear_mainw_msg();
+  dlg_thread_ready=FALSE;
+  while (g_main_context_iteration(NULL,FALSE));
+
   if (!has_cancel) pthread_create(&dthread,NULL,dth2,thread_text);
   else pthread_create(&dthread,NULL,dth2_with_cancel,thread_text);
-  sched_yield();
+  while (!dlg_thread_ready) {
+    g_usleep(prefs->sleep_time);
+    sched_yield();
+  }
+
+  pthread_mutex_lock(&mainw->gtk_mutex);
+  while (g_main_context_iteration(NULL,FALSE));
+  pthread_mutex_unlock(&mainw->gtk_mutex);
+
 }
 
 
@@ -1998,6 +2018,7 @@
   mainw->cancel_type=CANCEL_KILL;
   if (mainw->multitrack==NULL) gtk_widget_queue_draw(mainw->LiVES);
   else gtk_widget_queue_draw(mainw->multitrack->window);
+  while (g_main_context_iteration(NULL,FALSE));
 }

LiVES-1.4.2.tar.bz2/src/effects-weed.c -> LiVES-1.4.3.tar.bz2/src/effects-weed.c Changed

@@ -34,6 +34,12 @@
 
 ////////////////////////////////////////////////////////////////////////
 
+struct _procvals {
+  weed_plant_t *inst;
+  weed_timecode_t tc;
+};
+
+
 #define OIL_MEMCPY_MAX_BYTES 1024 // this can be tuned to provide optimal performance
 
 #ifdef ENABLE_OIL
@@ -955,6 +961,10 @@
 	  redraw_pwindow(keyw,modew);
 	}
       }
+
+      // redraw set defs window
+
+
     }
     if (!deinit_first) weed_call_deinit_func(inst);
     dummyvar=chdir(cwd);
@@ -983,6 +993,26 @@
 }
 
 
+static void *thread_process_func(void *arg) {
+  int retval,error;
+  struct _procvals *procvals=(struct _procvals *)arg;
+  weed_process_f *process_func_ptr_ptr;
+  weed_process_f process_func;
+
+  weed_plant_t *inst=procvals->inst;
+  weed_timecode_t tc=procvals->tc;
+
+  weed_plant_t *filter=weed_get_plantptr_value(inst,"filter_class",&error);
+
+  weed_leaf_get(filter,"process_func",0,(void *)&process_func_ptr_ptr);
+  process_func=process_func_ptr_ptr[0];
+
+  retval = (*process_func)(inst,tc);
+
+  return (void *)GINT_TO_POINTER(retval);
+}
+
+
 
 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:
@@ -1020,7 +1050,8 @@
   weed_plant_t *layer;
   weed_plant_t **in_channels,**out_channels,*channel,*chantmpl;
   int frame;
-  int inwidth,inheight,inpalette,outpalette,channel_flags,palette,cpalette,isubspace;
+  int inwidth,inheight,inpalette,outpalette,channel_flags,filter_flags=0;
+  int palette,cpalette,isubspace;
   int outwidth,outheight;
   gboolean needs_reinit=FALSE,inplace=FALSE;
   int incwidth,incheight,numplanes=0,width,height;
@@ -1528,17 +1559,99 @@
   weed_set_double_value(inst,"fps",cfile->pb_fps);
 
   //...finally we are ready to apply the filter
-  weed_leaf_get(filter,"process_func",0,(void *)&process_func_ptr_ptr);
-  process_func=process_func_ptr_ptr[0];
-  if ((*process_func)(inst,tc)==WEED_ERROR_PLUGIN_INVALID) {
-    weed_free(in_tracks);
-    weed_free(out_tracks);
-    weed_free(in_channels);
-    weed_free(out_channels);
-    return FILTER_ERROR_MUST_RELOAD;
-  }
 
-  // TODO - handle process errors (WEED_ERROR_PLUGIN_INVALID)
+  // see if we can multithread
+  if ((prefs->nfx_threads=future_prefs->nfx_threads)>1 && weed_plant_has_leaf(filter,"flags")) 
+    filter_flags=weed_get_int_value(filter,"flags",&error);
+
+  if (filter_flags&WEED_FILTER_HINT_MAY_THREAD) {
+    // split output(s) into horizontal slices
+    int offset=0;
+    int dheight;
+    int nthreads=0;
+    gboolean got_invalid=FALSE;
+    weed_plant_t **xchannels;
+    int nchannels=weed_leaf_num_elements(inst,"out_channels");
+
+    struct _procvals procvals[MAX_FX_THREADS];
+    pthread_t dthreads[MAX_FX_THREADS];
+    weed_plant_t *xinst[MAX_FX_THREADS];
+
+    channel=get_enabled_channel(inst,0,FALSE);
+    height=0;
+
+    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);
+	dheight=(int)((double)height/(double)prefs->nfx_threads);
+	if (dheight<2) dheight=2; // must have a minimum height of 2
+	offset=dheight*j;
+	weed_set_int_value(xchannels[i],"offset",offset);
+	if (j==prefs->nfx_threads-1) dheight=height-(dheight*j);
+	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;
+
+      // start a thread for processing
+      pthread_create(&dthreads[j],NULL,thread_process_func,&procvals[j]);
+      nthreads++; // actual number of threads used
+    }
+
+    // wait for threads to finish
+    for (j=0;j<prefs->nfx_threads;j++) {
+      void *tretval;
+      int 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) {
+      weed_free(in_tracks);
+      weed_free(out_tracks);
+      weed_free(in_channels);
+      weed_free(out_channels);
+      return FILTER_ERROR_MUST_RELOAD;
+    }
+  }
+  else {
+    // normal single threaded version
+    weed_leaf_get(filter,"process_func",0,(void *)&process_func_ptr_ptr);
+    process_func=process_func_ptr_ptr[0];
+    if ((*process_func)(inst,tc)==WEED_ERROR_PLUGIN_INVALID) {
+      weed_free(in_tracks);
+      weed_free(out_tracks);
+      weed_free(in_channels);
+      weed_free(out_channels);
+      return FILTER_ERROR_MUST_RELOAD;
+    }
+  }
 
   // now we write our out channels back to layers, leaving the palettes and sizes unchanged
   for (i=0;i<num_out_tracks;i++) {
@@ -2720,7 +2833,7 @@
   
   int error,reason,idx=num_weed_filters;
 
-  weed_plant_t *plugin_info,**filters;
+  weed_plant_t *plugin_info,**filters,*filter;
   void *handle;
   int filters_in_plugin;
   int mode=-1,kmode=0;
@@ -2741,7 +2854,7 @@
 #endif
 
 #ifdef RTLD_DEEPBIND // local symbols override global symbols in the plugins
-  // this may allow for non-static linking of libweed with
+  // this may allow for non-static linking of libweed with the plugins
   if ((handle=dlopen(plugin_path,RTLD_LAZY|RTLD_DEEPBIND))) {
 #else
   if ((handle=dlopen(plugin_path,RTLD_LAZY))) {
@@ -2763,7 +2876,7 @@
 
       plugin_info=(*setup_fn)(bootstrap);
       if (plugin_info==NULL||(filters_in_plugin=check_weed_plugin_info(plugin_info))<1) {
-	g_printerr ("error loading plugin %s\n",plugin_path);
+	g_printerr (_("No usable filters found in plugin %s\n"),plugin_path);
 	if (plugin_info!=NULL) weed_plant_free(plugin_info);
 	dlclose (handle);
 	dummyvar=chdir(cwd);
@@ -2801,12 +2914,16 @@
 	    if (key<FX_KEYS_PHYSICAL) d_print(g_strdup_printf("Loaded filter \"%s\" in plugin \"%s\"; assigned to key ctrl-%d, mode %d.\n",filter_name,plugin_name,key+1,kmode+1));

LiVES-1.4.2.tar.bz2/src/effects-weed.h -> LiVES-1.4.3.tar.bz2/src/effects-weed.h Changed

LiVES-1.4.2.tar.bz2/src/events.c -> LiVES-1.4.3.tar.bz2/src/events.c Changed

LiVES-1.4.2.tar.bz2/src/gui.c -> LiVES-1.4.3.tar.bz2/src/gui.c Changed

@@ -18,6 +18,7 @@
 #include "stream.h"
 #include "startup.h"
 
+
 #ifdef ENABLE_OSC
 #include "omc-learn.h"
 #endif
@@ -3675,6 +3676,7 @@
       // init the playback plugin, unless there is a possibility of wrongly sized frames (i.e. during a preview)
       if (mainw->vpp!=NULL&&(!mainw->preview||mainw->multitrack!=NULL)) {
 	gboolean fixed_size=FALSE;
+
 	gdk_window_get_pointer (gdk_get_default_root_window (), &mainw->ptr_x, &mainw->ptr_y, NULL);
 	if (prefs->play_monitor!=0) mainw->ptr_x=mainw->ptr_y=-1;
 	if (mainw->vpp->fheight>-1&&mainw->vpp->fwidth>-1) {	  
@@ -3705,7 +3707,20 @@
 	  xwinid=mainw->xwin;
 	}
 
-	if (mainw->ext_playback&&mainw->vpp->exit_screen!=NULL) (*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
+	if (mainw->ext_playback) {
+	  stop_audio_stream();
+	  if (mainw->vpp->exit_screen!=NULL) {
+	    (*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
+	  }
+	}
+
+	if (mainw->vpp->audio_codec!=AUDIO_CODEC_NONE&&prefs->stream_audio_out) {
+	  start_audio_stream();
+	}
+	else {
+	  clear_audio_stream();
+	}
+
 
 	if ((mainw->vpp->init_screen==NULL)||((*mainw->vpp->init_screen)(mainw->pwidth,mainw->pheight*(fixed_size?1:prefs->virt_height),fullscreen,xwinid,mainw->vpp->extra_argc,mainw->vpp->extra_argv))) {
 	  mainw->ext_playback=TRUE;

LiVES-1.4.2.tar.bz2/src/jack.c -> LiVES-1.4.3.tar.bz2/src/jack.c Changed

@@ -1,6 +1,6 @@
 // jack.c
 // LiVES (lives-exe)
-// (c) G. Finch 2005 - 2010
+// (c) G. Finch 2005 - 2011
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -16,6 +16,17 @@
 
 static jack_client_t *jack_transport_client;
 
+static unsigned char *zero_buff=NULL;
+static size_t zero_buff_count=0;
+
+static void check_zero_buff(size_t check_size) {
+  if (check_size>zero_buff_count) {
+    zero_buff=g_realloc(zero_buff,check_size);
+    memset(zero_buff+zero_buff_count,0,check_size-zero_buff_count);
+    zero_buff_count=check_size;
+  }
+}
+
 gboolean lives_jack_init (void) {
   gchar *jt_client=g_strdup_printf("LiVES-%d",getpid());
   const char *server_name="default";
@@ -282,6 +293,7 @@
   gboolean from_memory=FALSE;
   gboolean wait_cache_buffer=FALSE;
   lives_audio_buf_t *cache_buffer=NULL;
+  size_t nbytes;
 
 #ifdef DEBUG_AJACK
   g_printerr("nframes %ld, sizeof(float) == %d\n", (long)nframes, sizeof(float));
@@ -373,6 +385,12 @@
       /* output silence if nothing is being outputted */
       if (!jackd->is_silent) for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], nframes);
       jackd->is_silent=TRUE;
+
+      // external streaming
+      nbytes=nframes*4;
+      check_zero_buff(nbytes);
+      audio_stream(zero_buff,nbytes,jackd->astream_fd);
+
       if (!jackd->is_paused) jackd->frames_written+=nframes;
       if (jackd->seek_pos<0.&&jackd->playing_file>-1&&afile!=NULL) {
 	jackd->seek_pos+=nframes*afile->achans*afile->asampsize/8;
@@ -447,6 +465,12 @@
 	    if (!wait_cache_buffer) push_cache_buffer( cache_buffer, jackd, in_bytes, nframes, shrink_factor );
 
 	    for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], nframes);
+
+	    // external streaming
+	    nbytes=nframes*4;
+	    check_zero_buff(nbytes);
+	    audio_stream(zero_buff,nbytes,jackd->astream_fd);
+
 	    jackd->frames_written+=nframes;
 	    return 0;
 	  }
@@ -491,6 +515,12 @@
 	  // reached end of audio with no looping
 	  for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], nframes);
 	  jackd->is_silent=TRUE;
+
+	  // external streaming
+	  nbytes=nframes*4;
+	  check_zero_buff(nbytes);
+	  audio_stream(zero_buff,nbytes,jackd->astream_fd);
+
 	  if (!jackd->is_paused) jackd->frames_written+=nframes;
 	  if (jackd->seek_pos<0.&&jackd->playing_file>-1&&afile!=NULL) {
 	    jackd->seek_pos+=nframes*afile->achans*afile->asampsize/8;
@@ -522,19 +552,100 @@
       
       if ( !from_memory && numFramesToWrite > 0 ) {
 	if (((gint)(jackd->num_calls/100.))*100==jackd->num_calls) if (mainw->soft_debug) g_print("audio pip\n");
-	if (cache_buffer->bufferf!=NULL)
-
+	if (cache_buffer->bufferf!=NULL) {
 	  for (i=0;i<jackd->num_output_channels;i++) {
 	    sample_move_d16_float(out_buffer[i], cache_buffer->buffer16[0] + i, numFramesToWrite, jackd->num_output_channels, afile->signed_endian&AFORM_UNSIGNED, vol);
 	  }
 
+	  if (jackd->astream_fd!=-1) {
+	    unsigned char *xbuf=(unsigned char *)cache_buffer->buffer16[0];
+	    // audio streaming if enabled
+	    nbytes=numFramesToWrite*4;
+
+	    if (jackd->num_output_channels!=2) {
+	      // need to remap channels to stereo (assumed for now)
+	      size_t bysize=4,tsize=0;
+	      unsigned char *inbuf=(unsigned char *)cache_buffer->buffer16[0];
+	      xbuf=g_malloc(nbytes);
+	      
+	      if (jackd->num_output_channels==1) bysize=2;
+	      while (nbytes>0) {
+		memcpy(xbuf+tsize,inbuf,bysize);
+		tsize+=bysize;
+		nbytes-=bysize;
+		if (bysize==2) {
+		  // duplicate mono channel
+		  memcpy(xbuf+tsize,inbuf,bysize);
+		  tsize+=bysize;
+		  nbytes-=bysize;
+		  inbuf+=bysize;
+		}
+		else {
+		  // or skip extra channels
+		  inbuf+=jackd->num_output_channels*4;
+		}
+	      }
+	      nbytes=numFramesToWrite*4;
+	    }
+	    audio_stream(xbuf,nbytes,jackd->astream_fd);
+	    if (xbuf!=(unsigned char *)cache_buffer->buffer16[0]) g_free(xbuf);
+	  }
+
+	}
+	else {
+	  for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], numFramesToWrite);
+	  
+	  // external streaming
+	  nbytes=numFramesToWrite*4;
+	  check_zero_buff(nbytes);
+	  audio_stream(zero_buff,nbytes,jackd->astream_fd);
+	}
       }
       else {
 	if (jackd->read_abuf>-1&&!jackd->mute) {
 	  sample_move_abuf_float(out_buffer,jackd->num_output_channels,nframes,jackd->sample_out_rate,vol);
+
+	  if (jackd->astream_fd!=-1) {
+	    // audio streaming if enabled
+	    unsigned char *xbuf=(unsigned char *)out_buffer;
+	    nbytes=numFramesToWrite*4;
+
+	    if (jackd->num_output_channels!=2) {
+	      // need to remap channels to stereo (assumed for now)
+	      size_t bysize=4,tsize=0;
+	      unsigned char *inbuf=(unsigned char *)out_buffer;
+	      xbuf=g_malloc(nbytes);
+	      
+	      if (jackd->num_output_channels==1) bysize=2;
+	      while (nbytes>0) {
+		memcpy(xbuf+tsize,inbuf,bysize);
+		tsize+=bysize;
+		nbytes-=bysize;
+		if (bysize==2) {
+		  // duplicate mono channel
+		  memcpy(xbuf+tsize,inbuf,bysize);
+		  tsize+=bysize;
+		  nbytes-=bysize;
+		  inbuf+=bysize;
+		}
+		else {
+		  // or skip extra channels
+		  inbuf+=jackd->num_output_channels*4;
+		}
+	      }
+	      nbytes=numFramesToWrite*4;
+	    }
+	    audio_stream(xbuf,nbytes,jackd->astream_fd);
+	    if (xbuf!=(unsigned char *)out_buffer) g_free(xbuf);
+	  }
 	}
 	else {
 	  for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], nframes);
+	  
+	  // external streaming
+	  nbytes=nframes*4;
+	  check_zero_buff(nbytes);
+	  audio_stream(zero_buff,nbytes,jackd->astream_fd);
 	}
       }
     }
@@ -556,6 +667,11 @@
       g_printerr("buffer underrun of %ld frames\n", jackFramesAvailable);
 #endif
       for(i = 0 ; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i] + (nframes - jackFramesAvailable), jackFramesAvailable);
+
+      // external streaming
+      nbytes=jackFramesAvailable*4;
+      check_zero_buff(nbytes);
+      audio_stream(zero_buff,nbytes,jackd->astream_fd);
     }
 
   }
@@ -567,6 +683,12 @@
     /* output silence if nothing is being outputted */
     for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], nframes);
     jackd->is_silent=TRUE;
+
+    // external streaming
+    nbytes=nframes*4;
+    check_zero_buff(nbytes);
+    audio_stream(zero_buff,nbytes,jackd->astream_fd);
+
     /* if we were told to reset then zero out some variables */
     /* and transition to STOPPED */

LiVES-1.4.2.tar.bz2/src/jack.h -> LiVES-1.4.3.tar.bz2/src/jack.h Changed

LiVES-1.4.2.tar.bz2/src/main.c -> LiVES-1.4.3.tar.bz2/src/main.c Changed

@@ -1,6 +1,6 @@
 // main.c
 // LiVES (lives-exe)
-// (c) G. Finch 2003 - 2010
+// (c) G. Finch 2003 - 2011
 
 /*  This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License version 3 or higher as published by
@@ -64,6 +64,14 @@
 
 #include <getopt.h>
 
+
+#ifdef IS_DARWIN
+#include <mach/mach.h>
+#include <mach/processor_info.h>
+#include <mach/mach_host.h>
+#endif
+
+
 ////////////////////////////////
 capability *capable;
 _palette *palette;
@@ -157,7 +165,7 @@
 
   dlist=dislist=gdk_display_manager_list_displays(gdk_display_manager_get());
 
-  mainw->nmonitors=0;
+  capable->nmonitors=0;
 
   // for each display get list of screens
 
@@ -168,15 +176,15 @@
     nscreens=gdk_display_get_n_screens(disp);
     for (i=0;i<nscreens;i++) {
       screen=gdk_display_get_screen(disp,i);
-      mainw->nmonitors+=gdk_screen_get_n_monitors(screen);
+      capable->nmonitors+=gdk_screen_get_n_monitors(screen);
     }
     dlist=dlist->next;
   }
 
-  if (prefs->force_single_monitor) mainw->nmonitors=1; // force for clone mode
+  if (prefs->force_single_monitor) capable->nmonitors=1; // force for clone mode
 
-  if (mainw->nmonitors>1) {
-    mainw->mgeom=(lives_mgeometry_t *)g_malloc(mainw->nmonitors*sizeof(lives_mgeometry_t));
+  if (capable->nmonitors>1) {
+    mainw->mgeom=(lives_mgeometry_t *)g_malloc(capable->nmonitors*sizeof(lives_mgeometry_t));
     dlist=dislist;
 
     while (dlist!=NULL) {
@@ -269,6 +277,7 @@
   prefs->sepwin_type=1;
   prefs->show_framecount=TRUE;
   prefs->audio_player=AUD_PLAYER_SOX;
+  g_snprintf(prefs->aplayer,512,"%s","sox");
   prefs->open_decorated=TRUE;
 
   prefs->lamp_buttons=TRUE;
@@ -335,10 +344,12 @@
     prefs->audio_player=AUD_PLAYER_JACK;
   if (!strcmp(buff,"pulse"))
     prefs->audio_player=AUD_PLAYER_PULSE;
-  
+  g_snprintf(prefs->aplayer,512,"%s",buff);
+
 #ifdef HAVE_PULSE_AUDIO
   if ((prefs->startup_phase==1||prefs->startup_phase==-1)&&capable->has_pulse_audio) {
     prefs->audio_player=AUD_PLAYER_PULSE;
+    g_snprintf(prefs->aplayer,512,"%s","pulse");
     set_pref("audio_player","pulse");
   }
   else {
@@ -349,6 +360,7 @@
 #ifdef ENABLE_JACK
     if ((prefs->startup_phase==1||prefs->startup_phase==-1)&&capable->has_jackd) {
       prefs->audio_player=AUD_PLAYER_JACK;
+      g_snprintf(prefs->aplayer,512,"%s","jack");
       set_pref("audio_player","jack");
     }
 #endif
@@ -370,7 +382,7 @@
 
   get_monitors();
 
-  if (mainw->nmonitors>1) {
+  if (capable->nmonitors>1) {
 
     get_pref("monitors",buff,256);
 
@@ -387,8 +399,8 @@
 
     if (prefs->gui_monitor<1) prefs->gui_monitor=1;
     if (prefs->play_monitor<0) prefs->play_monitor=0;
-    if (prefs->gui_monitor>mainw->nmonitors) prefs->gui_monitor=mainw->nmonitors;
-    if (prefs->play_monitor>mainw->nmonitors) prefs->play_monitor=mainw->nmonitors;
+    if (prefs->gui_monitor>capable->nmonitors) prefs->gui_monitor=capable->nmonitors;
+    if (prefs->play_monitor>capable->nmonitors) prefs->play_monitor=capable->nmonitors;
   }
 
 
@@ -918,6 +930,12 @@
 
     get_pref("def_autotrans",prefs->def_autotrans,256);
 
+    prefs->nfx_threads=get_int_pref("nfx_threads");
+    if (prefs->nfx_threads==0) prefs->nfx_threads=capable->ncpus;
+    future_prefs->nfx_threads=prefs->nfx_threads;
+
+    prefs->stream_audio_out=get_boolean_pref("stream_audio_out");
+
     //////////////////////////////////////////////////////////////////
 
     weed_memory_init();
@@ -1317,6 +1335,8 @@
       prefs->startup_phase=100;
     }
 
+    if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
+
     // toolbar buttons
     gtk_widget_modify_bg (mainw->tb_hbox, GTK_STATE_NORMAL, &palette->fade_colour);
     gtk_widget_modify_bg (mainw->toolbar, GTK_STATE_NORMAL, &palette->fade_colour);
@@ -1365,7 +1385,10 @@
   g_snprintf(mainw->msg,512,_ ("\n\nWindow manager reports as \"%s\"; "),prefs->wm);
   d_print(mainw->msg);
 
-  g_snprintf(mainw->msg,512,_("number of monitors detected: %d\n"),mainw->nmonitors);
+  g_snprintf(mainw->msg,512,_("number of monitors detected: %d\n"),capable->nmonitors);
+  d_print(mainw->msg);
+
+  g_snprintf(mainw->msg,512,_("Number of CPUs detected: %d\n"),capable->ncpus);
   d_print(mainw->msg);
 
   g_snprintf(mainw->msg,512,_ ("Temp directory is %s\n"),prefs->tmpdir);
@@ -1505,11 +1528,19 @@
   gchar **array;
   
   gchar buffer[8192];
-  FILE *bootfile;
+  FILE *bootfile,*tfile;
   gchar string[256];
   int err;
   gint numtok;
   gchar *tmp;
+  size_t len;
+
+#ifdef IS_DARWIN
+  processor_info_array_t processorInfo;
+  mach_msg_type_number_t numProcessorInfo;
+  natural_t numProcessors = 0U;
+  kern_return_t err;
+#endif
 
   capable=(capability *)g_malloc(sizeof(capability));
 
@@ -1674,12 +1705,29 @@
     }
   }
 
+  capable->ncpus=0;
+
+#ifdef IS_DARWIN  
+  err = host_processor_info(mach_host_self(), PROCESSOR_CPU_LOAD_INFO, &numProcessors, &processorInfo, &numProcessorInfo);
+  capable->ncpus=(gint)numProcessors;
+#else
+
+  tfile=popen("cat /proc/cpuinfo 2>/dev/null | grep processor 2>/dev/null | wc -l 2>/dev/null","r");
+  len=fread((void *)buffer,1,1024,tfile);
+  pclose(tfile);
+
+  memset(buffer+len,0,1);
+  capable->ncpus=atoi(buffer);
+#endif
+
+  if (capable->ncpus==0) capable->ncpus=1;
+
   return capable;
 }
 
 void print_notice() {
   g_printerr("\nLiVES %s\n",LiVES_VERSION);
-  g_printerr("Copyright 2002-2010 Gabriel Finch (salsaman@xs4all.nl) and others.\n");
+  g_printerr("Copyright 2002-2011 Gabriel Finch (salsaman@xs4all.nl) and others.\n");
   g_printerr("LiVES comes with ABSOLUTELY NO WARRANTY\nThis is free software, and you are welcome to redistribute it\nunder certain conditions; see the file COPYING for details.\n\n");
 }
 
@@ -2081,6 +2129,7 @@
 	  if (!strcmp(buff,"jack")) {
 #ifdef ENABLE_JACK
 	    prefs->audio_player=AUD_PLAYER_JACK;
+	    g_snprintf(prefs->aplayer,512,"%s","jack");
 	    set_pref("audio_player","jack");
 	    apl_valid=TRUE;
 #endif
@@ -2089,6 +2138,7 @@
 #ifdef HAVE_PULSE_AUDIO
 	    prefs->audio_player=AUD_PLAYER_PULSE;
 	    set_pref("audio_player","pulse");

LiVES-1.4.2.tar.bz2/src/main.h -> LiVES-1.4.3.tar.bz2/src/main.h Changed

LiVES-1.4.2.tar.bz2/src/mainwindow.h -> LiVES-1.4.3.tar.bz2/src/mainwindow.h Changed

LiVES-1.4.2.tar.bz2/src/multitrack.c -> LiVES-1.4.3.tar.bz2/src/multitrack.c Changed

LiVES-1.4.2.tar.bz2/src/paramspecial.c -> LiVES-1.4.3.tar.bz2/src/paramspecial.c Changed

LiVES-1.4.2.tar.bz2/src/paramwindow.c -> LiVES-1.4.3.tar.bz2/src/paramwindow.c Changed

@@ -898,7 +898,8 @@
     okbutton = gtk_button_new_with_mnemonic (_("Set as default"));
     if (!has_param) gtk_widget_set_sensitive(okbutton,FALSE);
     cancelbutton = gtk_button_new_with_mnemonic (_("Close _window"));
-    gtk_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), okbutton, GTK_RESPONSE_OK);
+    if (rfx->status==RFX_STATUS_WEED)
+      gtk_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), okbutton, GTK_RESPONSE_OK);
     gtk_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), cancelbutton, GTK_RESPONSE_CANCEL);
     gtk_widget_add_accelerator (cancelbutton, "activate", fxw_accel_group,
 				GDK_Escape, 0, 0);
@@ -906,14 +907,21 @@
   }
 
   GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  gtk_widget_grab_default (okbutton);
+
+  if (okbutton->parent!=NULL) {
+    GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+    gtk_widget_grab_default (okbutton);
+  }
 
   gtk_widget_show_all (fx_dialog[n]);
 
   if (no_process&&!is_defaults) {
     if (!is_realtime) {
-      g_signal_connect (GTK_OBJECT (okbutton), "clicked",
+      if (okbutton->parent!=NULL)
+	g_signal_connect (GTK_OBJECT (okbutton), "clicked",
+			  G_CALLBACK (on_paramwindow_cancel_clicked),
+			  rfx);
+      g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
 			G_CALLBACK (on_paramwindow_cancel_clicked),
 			rfx);
       g_signal_connect (GTK_OBJECT (fx_dialog[n]), "delete_event",
@@ -1705,7 +1713,7 @@
       gtk_box_pack_start (GTK_BOX (hbox), scrolledwindow, TRUE, TRUE, 10);
       g_object_set_data(G_OBJECT(hbox),"textwidget",(gpointer)textbuffer);
 
-      if (rfx->status!=RFX_STATUS_WEED&&mainw->multitrack==NULL) {
+      if (rfx->status!=RFX_STATUS_WEED) {
 	blockfunc=g_signal_connect_after (G_OBJECT (hbox), "set-focus-child", G_CALLBACK (after_param_text_focus_changed), (gpointer) rfx);
       }
       else {
@@ -1717,6 +1725,7 @@
 
       // store parameter so we know whose trigger to use
       g_object_set_data (G_OBJECT (textbuffer),"param_number",GINT_TO_POINTER (pnum));
+      g_object_set_data (G_OBJECT (textbuffer),"rfx",rfx);
     }
     else {
       if (use_mnemonic) gtk_label_set_mnemonic_widget (GTK_LABEL (label),entry);
@@ -1734,6 +1743,7 @@
       
       // store parameter so we know whose trigger to use
       g_object_set_data (G_OBJECT (entry),"param_number",GINT_TO_POINTER (pnum));
+      g_object_set_data (G_OBJECT (entry),"rfx",rfx);
     }
 
     break;

LiVES-1.4.2.tar.bz2/src/paramwindow.h -> LiVES-1.4.3.tar.bz2/src/paramwindow.h Changed

LiVES-1.4.2.tar.bz2/src/plugins.c -> LiVES-1.4.3.tar.bz2/src/plugins.c Changed

@@ -29,6 +29,8 @@
 #include "rfx-builder.h"
 #include "paramwindow.h"
 
+const char *anames[AUDIO_CODEC_MAX]={"mp3","pcm","mp2","vorbis","AC3","AAC","AMR_NB","raw",""};
+
 static gboolean list_plugins;
 
 
@@ -399,7 +401,6 @@
   dummyvar=read(fd,&(mainw->vpp->YUV_subspace),sizint);
   dummyvar=read(fd,&(mainw->vpp->fwidth),sizint);
   dummyvar=read(fd,&(mainw->vpp->fheight),sizint);
-  //mainw->vpp->fwidth=mainw->vpp->fheight=-1;
   dummyvar=read(fd,&(mainw->vpp->fixed_fpsd),sizdbl);
   dummyvar=read(fd,&(mainw->vpp->fixed_fps_numer),sizint);
   dummyvar=read(fd,&(mainw->vpp->fixed_fps_denom),sizint);
@@ -530,6 +531,9 @@
 	      if (mainw->vpp->exit_screen!=NULL) {
 		(*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
 	      }
+
+	      stop_audio_stream();
+
 	      mainw->stream_ticks=-1;
 	      mainw->vpp->palette=pal_list[i];
 	      if (!(*vpp->set_palette)(vpp->palette)) {
@@ -539,6 +543,10 @@
 
 	      if (vpp->set_yuv_palette_clamping!=NULL) (*vpp->set_yuv_palette_clamping)(vpp->YUV_clamping);
 
+	      if (mainw->vpp->audio_codec!=AUDIO_CODEC_NONE&&prefs->stream_audio_out) {
+		start_audio_stream();
+	      }
+
 	      if (vpp->init_screen!=NULL) {
 		(*vpp->init_screen)(mainw->pwidth,mainw->pheight,TRUE,0,vpp->extra_argc,vpp->extra_argv);
 	      }
@@ -987,6 +995,7 @@
   if (vpp!=NULL) {
     if (vpp==mainw->vpp) {
       if (mainw->ext_playback&&mainw->vpp->exit_screen!=NULL) (*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
+      stop_audio_stream();
       mainw->stream_ticks=-1;
       mainw->vpp=NULL;
     }
@@ -1086,11 +1095,11 @@
   vpp->get_yuv_palette_clamping=dlsym (handle,"get_yuv_palette_clamping");
   vpp->set_yuv_palette_clamping=dlsym (handle,"set_yuv_palette_clamping");
   vpp->send_keycodes=dlsym (handle,"send_keycodes");
+  vpp->get_audio_fmts=dlsym (handle,"get_audio_fmts");
   vpp->init_screen=dlsym (handle,"init_screen");
   vpp->exit_screen=dlsym (handle,"exit_screen");
   vpp->module_unload=dlsym (handle,"module_unload");
 
-
   vpp->YUV_sampling=0;
   vpp->YUV_subspace=0;
 
@@ -1111,6 +1120,7 @@
     }
   }
 
+  vpp->audio_codec=AUDIO_CODEC_NONE;
   vpp->capabilities=(*vpp->get_capabilities)(vpp->palette);
 
   if (vpp->capabilities&VPP_CAN_RESIZE) {
@@ -1194,6 +1204,10 @@
     }
   }
 
+  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;
 
   if (!mainw->is_ready) {
@@ -1255,6 +1269,7 @@
   // external plugin
   if (mainw->ext_playback) {
     if (mainw->vpp->exit_screen!=NULL) (*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
+    stop_audio_stream();
     mainw->ext_playback=FALSE;
   }
   mainw->stream_ticks=-1;
@@ -1264,6 +1279,62 @@
   gtk_window_set_title (GTK_WINDOW (mainw->play_window),_("LiVES: - Play Window"));
 }
 
+
+gint64 get_best_audio(_vid_playback_plugin *vpp) {
+  // find best audio from video plugin list, matching with audiostream plugins
+  int *fmts,*sfmts;
+  int ret=AUDIO_CODEC_NONE;
+  int i,j=0,nfmts;
+  size_t rlen;
+  gchar *astreamer,*com,*playername;
+  gchar buf[1024];
+  gchar **array;
+  FILE *rfile;
+
+  if (vpp!=NULL&&vpp->get_audio_fmts!=NULL) {
+    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);
+
+    // 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);
+    pclose(rfile);
+    memset(buf+rlen,0,1);
+    g_free(com);
+
+    nfmts=get_token_count(buf,'|');
+    array=g_strsplit(buf,"|",nfmts);
+    sfmts=g_malloc(nfmts*sizint);
+
+    for (i=0;i<nfmts;i++) {
+      if (array[i]!=NULL&&strlen(array[i])>0) sfmts[j++]=atoi(array[i]);
+    }
+
+    nfmts=j;
+    g_strfreev(array);
+
+    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;
+      }
+    }
+    g_free(sfmts);
+  }
+
+  return ret;
+}
+
+
 ///////////////////////
 // encoder plugins

LiVES-1.4.2.tar.bz2/src/plugins.h -> LiVES-1.4.3.tar.bz2/src/plugins.h Changed

@@ -20,7 +20,7 @@
 #define PLUGIN_ENCODERS "encoders"
 #define PLUGIN_DECODERS "decoders"
 #define PLUGIN_VID_PLAYBACK "playback/video"
-
+#define PLUGIN_AUDIO_STREAM "playback/audiostream"
 
 /// smogrify handles the directory differently for themes
 #define PLUGIN_THEMES "themes"
@@ -73,6 +73,13 @@
   int (*set_yuv_palette_clamping) (int palette);
   int (*set_yuv_palette_subspace) (int palette);
 
+  // audio streaming
+  int *(*get_audio_fmts)(void);
+
+  guint32 audio_codec;
+  // must match with the "acodec" GList in interface.c
+  // and bitmaps in the encder plugins, with this one addition:
+
   guint64 capabilities;
 
 #define VPP_CAN_RESIZE    1<<0
@@ -103,6 +110,7 @@
 _vid_playback_plugin *open_vid_playback_plugin (const gchar *name, gboolean using);
 void vid_playback_plugin_exit (void);
 void close_vid_playback_plugin(_vid_playback_plugin *);
+gint64 get_best_audio(_vid_playback_plugin *);
 void save_vpp_defaults(_vid_playback_plugin *, gchar *file);
 void load_vpp_defaults(_vid_playback_plugin *, gchar *file);
 
@@ -117,8 +125,7 @@
   gchar name[51];
   guint32 audio_codec;
   // must match with the "acodec" GList in interface.c
-
-  // TODO ** - fixme (change to bitmap, add raw pcm)
+  // and bitmaps in the encoder plugins
 
 #define AUDIO_CODEC_MP3 0
 #define AUDIO_CODEC_PCM 1
@@ -127,6 +134,7 @@
 #define AUDIO_CODEC_AC3 4
 #define AUDIO_CODEC_AAC 5
 #define AUDIO_CODEC_AMR_NB 6
+#define AUDIO_CODEC_RAW 7
 
 #define AUDIO_CODEC_MAX 31
   //
@@ -151,6 +159,8 @@
 _encoder;
 
 
+extern const char *anames[AUDIO_CODEC_MAX];
+
 
 // decoder plugins

LiVES-1.4.2.tar.bz2/src/preferences.c -> LiVES-1.4.3.tar.bz2/src/preferences.c Changed

@@ -1,6 +1,6 @@
 // preferences.c
 // LiVES (lives-exe)
-// (c) G. Finch 2004 - 2010
+// (c) G. Finch 2004 - 2011
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -304,11 +304,14 @@
 
   gdouble default_fps=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_def_fps));
   gboolean pause_xmms=FALSE;
-  gboolean antialias=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->stop_screensaver_check));
+  gboolean antialias=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_antialias));
+  gboolean fx_threads=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_threads));
+  gint nfx_threads=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_nfx_threads));
   gboolean stop_screensaver=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->stop_screensaver_check));
   gboolean open_maximised=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->open_maximised_check));
   gboolean fs_maximised=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->fs_max_check));
   gboolean show_recent=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->recent_check));
+  gboolean stream_audio_out=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_stream_audio));
 
   gboolean warn_fps=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_fps));
   gboolean warn_save_set=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_save_set));
@@ -549,6 +552,13 @@
     set_boolean_pref("antialias",antialias);
   }
 
+  // fx_threads
+  if (!fx_threads) nfx_threads=1;
+  if (prefs->nfx_threads!=nfx_threads) {
+    future_prefs->nfx_threads=nfx_threads;
+    set_int_pref("nfx_threads",nfx_threads);
+  }
+
   // open maximised
   if (prefs->open_maximised!=open_maximised) {
     prefs->open_maximised=open_maximised;
@@ -570,7 +580,7 @@
     get_monitors();
   }
 
-  if (mainw->nmonitors>1) {
+  if (capable->nmonitors>1) {
     if (gui_monitor!=prefs->gui_monitor||play_monitor!=prefs->play_monitor) {
       gchar *str=g_strdup_printf("%d,%d",gui_monitor,play_monitor);
       set_pref("monitors",str);
@@ -596,7 +606,7 @@
 	}
 	
 	
-	if ((prefs->gui_monitor!=0||mainw->nmonitors<=1)&&prefs->open_maximised) {
+	if ((prefs->gui_monitor!=0||capable->nmonitors<=1)&&prefs->open_maximised) {
 	  gtk_window_maximize (GTK_WINDOW(mainw->multitrack->window));
 	}
       }
@@ -611,6 +621,11 @@
     set_boolean_pref("show_player_stats",show_player_stats);
   }
 
+  if (prefs->stream_audio_out!=stream_audio_out) {
+    prefs->stream_audio_out=stream_audio_out;
+    set_boolean_pref("stream_audio_out",stream_audio_out);
+  }
+
   // show recent
   if (prefs->show_recent!=show_recent) {
     prefs->show_recent=show_recent;
@@ -1249,6 +1264,9 @@
     future_prefs->vpp_argv=NULL;
   }
   future_prefs->vpp_argc=0;
+
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_stream_audio),FALSE);
+
 }
 
 
@@ -1354,9 +1372,99 @@
 #endif
   g_free(prefsw->audp_name);
   prefsw->audp_name=g_strdup(gtk_combo_box_get_active_text(GTK_COMBO_BOX(audp_combo)));
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_stream_audio),FALSE);
+}
+
+
+static void stream_audio_toggled(GtkToggleButton *togglebutton,
+			  gpointer  user_data) {
+  // if audio streaming is enabled, check requisites
+
+
+  if (gtk_toggle_button_get_active(togglebutton)) {
+    // init vpp, get audio codec, check requisites
+    _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;
+    }
+    else {
+      tmpvpp=mainw->vpp;
+      orig_acodec=mainw->vpp->audio_codec;
+      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];
+      gchar *com;
+      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);
+      
+      com=g_strdup_printf("%s check",astreamer);
+      g_free(astreamer);
+      
+      rfile=popen(com,"r");
+      rlen=fread(buf,1,1023,rfile);
+      pclose(rfile);
+      memset(buf+rlen,0,1);
+      g_free(com);
+
+      if (rlen>0) {
+	gtk_toggle_button_set_active(togglebutton, FALSE);
+	do_error_dialog_with_check_transient 
+	  (buf,TRUE,0,GTK_WINDOW(prefsw->prefs_dialog));
+      }
+    }
+
+    if (tmpvpp!=NULL) {
+      if (tmpvpp!=mainw->vpp) {
+	// close the temp current vpp
+	close_vid_playback_plugin(tmpvpp);
+      }
+      else {
+	// restore current codec
+	mainw->vpp->audio_codec=orig_acodec;
+      }
+    }
+
+  }
+
+}
+
+
+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);
+    }
+  }
+  else {
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),FALSE);
+    gtk_widget_set_sensitive(prefsw->checkbutton_stream_audio,FALSE);
+  }
 }
 
+
 /*
  * Initialize preferences dialog list
  */
@@ -1489,6 +1597,12 @@
    gtk_widget_set_sensitive(GTK_WIDGET(prefsw->closebutton), FALSE);
 }
 
+// toggle sets other widget sensitive/insensitive
+static void toggle_set_sensitive(GtkWidget *widget, gpointer func_data)
+{
+  gtk_widget_set_sensitive(GTK_WIDGET(func_data), gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
+}
+
 void populate_combo_box(GtkComboBox *combo, GList *data)
 {
   gchar			*text;
@@ -1691,7 +1805,7 @@
 
   int i;
 
-  gint nmonitors = mainw->nmonitors; ///< number of screen monitors
+  gint nmonitors = capable->nmonitors; ///< number of screen monitors
   gboolean pfsm;
 
   gchar *theme;

LiVES-1.4.2.tar.bz2/src/preferences.h -> LiVES-1.4.3.tar.bz2/src/preferences.h Changed

@@ -1,6 +1,6 @@
 // preferences.h
 // LiVES (lives-exe)
-// (c) G. Finch 2004 - 2010
+// (c) G. Finch 2004 - 2011
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -28,6 +28,8 @@
 #define AUD_PLAYER_JACK 3
 #define AUD_PLAYER_PULSE 4
 
+  gchar aplayer[512]; // name, eg. "jack","pulse","sox","mplayer"
+
   /// frame quantisation type
   gshort q_type;
 #define Q_FILL 1
@@ -269,6 +271,10 @@
   gint atrans_fx;
   gchar def_autotrans[256];
 
+  gint nfx_threads;
+
+  gboolean stream_audio_out;
+
 } _prefs;
 
 enum {
@@ -355,6 +361,7 @@
   GtkWidget *rdesk_audio;
   GtkWidget *encoder_combo;
   GtkWidget *checkbutton_antialias;
+  GtkWidget *checkbutton_threads;
   GtkWidget *checkbutton_warn_fps;
   GtkWidget *checkbutton_warn_mplayer;
   GtkWidget *checkbutton_warn_save_set;
@@ -391,6 +398,7 @@
   GtkWidget *acodec_combo;
   GtkWidget *spinbutton_osc_udp;
   GtkWidget *spinbutton_rte_keys;
+  GtkWidget *spinbutton_nfx_threads;
   GtkWidget *enable_OSC;
   GtkWidget *enable_OSC_start;
   GtkWidget *jack_tserver_entry;
@@ -439,6 +447,7 @@
   GtkWidget *jack_int_label;
   GtkWidget *checkbutton_ce_maxspect;
   GtkWidget *temp_label;
+  GtkWidget *checkbutton_stream_audio;
   gboolean needs_restart;
 } _prefsw;
 
@@ -471,6 +480,9 @@
   gboolean osc_start;
   gint startup_interface;
   guint jack_opts;
+
+  gint nfx_threads;
+
 } _future_prefs;
 
 _prefs *prefs;
@@ -498,6 +510,8 @@
 
 void populate_combo_box(GtkComboBox *combo, GList *data);
 
-void set_combo_box_active_string(GtkComboBox *combo, gchar *active_str);
+void set_combo_box_active_string(GtkComboBox *, gchar *active_str);
+
+void prefsw_set_astream_settings(_vid_playback_plugin *);
 
 #endif

LiVES-1.4.2.tar.bz2/src/pulse.c -> LiVES-1.4.3.tar.bz2/src/pulse.c Changed

@@ -140,6 +140,7 @@
   while (nbytes>0) {
     if (nbytes<xbytes) xbytes=nbytes;
     buff=g_malloc0(xbytes);
+    audio_stream(buff,xbytes,pdriver->astream_fd);
     pa_stream_write(pdriver->pstream,buff,xbytes,pulse_buff_free,0,PA_SEEK_RELATIVE);
     nbytes-=xbytes;
   }
@@ -459,12 +460,14 @@
 	     offs+=xbytes;
 	     needs_free=TRUE;
 	   }
+	   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);
 	     pa_stream_write(pulsed->pstream,shortbuffer,xbytes,pulse_buff_free,0,PA_SEEK_RELATIVE);
 	   }
 	   else {
@@ -486,7 +489,7 @@
       sample_silence_pulse(pulsed,pulseFramesAvailable*pulsed->out_achans
 			   *(pulsed->out_asamps>>3),xbytes);
     }
-  }
+   }
   else {
 #ifdef DEBUG_PULSE
     g_printerr("PAUSED or STOPPED or CLOSED, outputting silence\n");
@@ -635,6 +638,7 @@
   pulsed.msgq=NULL;
   pulsed.num_calls=0;
   pulsed.chunk_size=0;
+  pulsed.astream_fd=-1;
   pulsed.pulsed_died=FALSE;
   pulsed.aPlayPtr=(audio_buffer_t *)g_malloc(sizeof(audio_buffer_t));
   pulsed.aPlayPtr->data=NULL;
@@ -669,6 +673,7 @@
   pulsed_reader.msgq=NULL;
   pulsed_reader.num_calls=0;
   pulsed_reader.chunk_size=0;
+  pulsed_reader.astream_fd=-1;
   pulsed_reader.pulsed_died=FALSE;
   gettimeofday(&pulsed_reader.last_reconnect_attempt, 0);
   pulsed_reader.in_achans=2;

LiVES-1.4.2.tar.bz2/src/pulse.h -> LiVES-1.4.3.tar.bz2/src/pulse.h Changed

LiVES-1.4.2.tar.bz2/src/resample.c -> LiVES-1.4.3.tar.bz2/src/resample.c Changed

@@ -346,6 +346,7 @@
   // only FRAME events are moved, other event types retain the same timecodes
 
   weed_plant_t *out_list;
+  weed_plant_t *last_audio_event=NULL;
   weed_plant_t *event,*last_frame_event,*penultimate_frame_event,*next_frame_event,*shortcut=NULL;
   weed_timecode_t out_tc=0,in_tc=-1,nearest_tc=LONG_MAX;
   gboolean is_first=TRUE;
@@ -354,7 +355,7 @@
   int numframes=0;
   weed_timecode_t tl=q_dbl(1./qfps,qfps);
   int error;
-  gboolean needs_audio=FALSE;
+  gboolean needs_audio=FALSE,add_audio=FALSE;
   int *aclips=NULL;
   double *aseeks=NULL;
   int num_aclips=0;
@@ -412,18 +413,14 @@
 
     // now we are dealing with a FRAME event
     if (event!=NULL) {
-      if (weed_plant_has_leaf(event,"audio_clips")) {
+      if (last_audio_event!=event&&weed_plant_has_leaf(event,"audio_clips")) {
+	last_audio_event=event;
 	needs_audio=TRUE;
 	if (aclips!=NULL) weed_free(aclips);
 	if (aseeks!=NULL) weed_free(aseeks);
 	num_aclips=weed_leaf_num_elements(event,"audio_clips");
 	aclips=weed_get_int_array(event,"audio_clips",&error);
 	aseeks=weed_get_double_array(event,"audio_seeks",&error);
-	if (error==WEED_ERROR_MEMORY_ALLOCATION) {
-	  do_memory_error_dialog();
-	  event_list_free(out_list);
-	  return NULL;
-	}
       }
       in_tc=get_event_timecode (event);
       if ((next_frame_event=get_next_frame_event(event))!=NULL) {
@@ -450,6 +447,7 @@
       numframes=weed_leaf_num_elements(event,"clips");
       out_clips=weed_get_int_array(event,"clips",&error);
       out_frames=weed_get_int_array(event,"frames",&error);
+      if (last_audio_event==event&&needs_audio) add_audio=TRUE;
       if (error==WEED_ERROR_MEMORY_ALLOCATION) {
 	do_memory_error_dialog();
 	event_list_free(out_list);
@@ -473,6 +471,7 @@
 	    numframes=weed_leaf_num_elements(event,"clips");
 	    out_clips=weed_get_int_array(event,"clips",&error);
 	    out_frames=weed_get_int_array(event,"frames",&error);
+	    if (last_audio_event==event&&needs_audio) add_audio=TRUE;
 	    if (error==WEED_ERROR_MEMORY_ALLOCATION) {
 	      do_memory_error_dialog();
 	      event_list_free(out_list);
@@ -486,10 +485,10 @@
 	    event_list_free(out_list);
 	    return NULL;
 	  }
-	  if (needs_audio) {
+	  if (add_audio) {
 	    weed_set_int_array(shortcut,"audio_clips",num_aclips,aclips);
 	    weed_set_double_array(shortcut,"audio_seeks",num_aclips,aseeks);
-	    needs_audio=FALSE;
+	    needs_audio=add_audio=FALSE;
 	  }
 	  nearest_tc=LONG_MAX;
 	  if (is_first) {

LiVES-1.4.2.tar.bz2/src/rte_window.c -> LiVES-1.4.3.tar.bz2/src/rte_window.c Changed

@@ -11,9 +11,11 @@
 #ifdef HAVE_SYSTEM_WEED
 #include "weed/weed.h"
 #include "weed/weed-host.h"
+#include "weed/weed-effects.h"
 #else
 #include "../libweed/weed.h"
 #include "../libweed/weed-host.h"
+#include "../libweed/weed-effects.h"
 #endif
 
 #include "main.h"
@@ -1224,7 +1226,8 @@
       
       while (list!=NULL) {
 	weed_plant_t *filter=get_weed_filter(weed_get_idx_for_hashname(g_list_nth_data(hash_list,fx_idx),FALSE));
-	if ((enabled_in_channels(filter,FALSE)>1&&!has_video_chans_in(filter,FALSE))||(weed_plant_has_leaf(filter,"host_menu_hide")&&weed_get_boolean_value(filter,"host_menu_hide",&error)==WEED_TRUE)) {
+	int filter_flags=weed_get_int_value(filter,"flags",&error);
+	if ((enabled_in_channels(filter,FALSE)>1&&!has_video_chans_in(filter,FALSE))||(weed_plant_has_leaf(filter,"host_menu_hide")&&weed_get_boolean_value(filter,"host_menu_hide",&error)==WEED_TRUE)||(filter_flags&WEED_FILTER_IS_CONVERTER)) {
 	  list = list->next;
 	  fx_idx++;
 	  continue; // skip audio transitions and hidden entries

LiVES-1.4.2.tar.bz2/src/saveplay.c -> LiVES-1.4.3.tar.bz2/src/saveplay.c Changed

LiVES-1.4.2.tar.bz2/src/utils.c -> LiVES-1.4.3.tar.bz2/src/utils.c Changed

@@ -1764,6 +1764,9 @@
     gtk_widget_show(mainw->vol_label);
     gtk_widget_show (mainw->recaudio_submenu);
 
+    if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
+      mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
+
 #ifdef HAVE_PULSE_AUDIO
     if (mainw->pulsed_read!=NULL) {
       pulse_close_client(mainw->pulsed_read);
@@ -1779,6 +1782,11 @@
   }
   prefs->audio_player=AUD_PLAYER_JACK;
   set_pref("audio_player","jack");
+  g_snprintf(prefs->aplayer,512,"%s","jack");
+
+  if (mainw->is_ready&&mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
+    mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
+
   return TRUE;
 #endif
   return FALSE;
@@ -1807,6 +1815,11 @@
 
       prefs->audio_player=AUD_PLAYER_PULSE;
       set_pref("audio_player","pulse");
+      g_snprintf(prefs->aplayer,512,"%s","pulse");
+
+      if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
+	mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
+
     }
     
 #ifdef ENABLE_JACK
@@ -1833,11 +1846,15 @@
   prefs->audio_player=AUD_PLAYER_SOX;
   get_pref_default("sox_command",prefs->audio_play_command,256);
   set_pref("audio_player","sox");
+  g_snprintf(prefs->aplayer,512,"%s","sox");
   set_pref("audio_play_command",prefs->audio_play_command);
   if (mainw->is_ready) {
     gtk_widget_hide(mainw->vol_toolitem);
     gtk_widget_hide(mainw->vol_label);
     gtk_widget_hide (mainw->recaudio_submenu);
+    
+    if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
+      mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
   }
 
 #ifdef ENABLE_JACK
@@ -1884,11 +1901,15 @@
   prefs->audio_player=AUD_PLAYER_MPLAYER;
   get_pref_default("mplayer_audio_command",prefs->audio_play_command,256);
   set_pref("audio_player","mplayer");
+  g_snprintf(prefs->aplayer,512,"%s","mplayer");
   set_pref("audio_play_command",prefs->audio_play_command);
   if (mainw->is_ready) {
     gtk_widget_hide(mainw->vol_toolitem);
     gtk_widget_hide(mainw->vol_label);
     gtk_widget_hide (mainw->recaudio_submenu);
+
+    if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
+      mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
   }
 
 #ifdef ENABLE_JACK